restructure for 17.1

Change-Id: I0a3f3cb0fb56718c4c7bdeab47108151c307998b

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e93bdf5dbac6b16864592e30660a8b532f8365d..40e62c3b8f4606b98942224510a243dc3a9b6973 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,13 +13,27 @@ build:
 
   script:
     - |
+      if [ ${VERSION} = '17.1' ]; then
+        export CCACHE_EXEC=$(which ccache)
+        export WITHOUT_CHECK_API=true
+      fi
       PATH="$HOME/bin:$PATH"
       if [ ${OTA} = 'false' ]; then
         export LINEAGE_VERSION_APPEND_TIME_OF_DAY=true
       fi
-      cd ~/android/lineage/${VERSION}
+      if [ -f ~/android/lineage/${VERSION} ]; then
+        cd ~/android/lineage/${VERSION}
+      else
+        mkdir -p ~/android/lineage/${VERSION}
+        cd ~/android/lineage/${VERSION}
+        if [ ${VERSION} = '14.1' ]; then
+          repo init -u git://github.com/LineageOS/android.git -b cm-${VERSION}
+        else
+          repo init -u git://github.com/LineageOS/android.git -b lineage-${VERSION}
+        fi
+      fi
       rm -rf .repo/local_manifests/*
-      cp ${CI_PROJECT_DIR}/manifests/lineage-${VERSION}-${DEVICE}.xml .repo/local_manifests/roomservice.xml
+      cp ${CI_PROJECT_DIR}/manifests/lineage-${VERSION}.xml .repo/local_manifests/roomservice.xml
       repo sync -d -c -j8 --force-sync
       . build/envsetup.sh
       if ! [ -z ${REPOPICK_NUMBERS} ]; then

diff --git a/manifests/lineage-14.1-ttab.xml b/manifests/lineage-14.1-ttab.xml
deleted file mode 100644 (file)
index 23e58ac..0000000
--- a/manifests/lineage-14.1-ttab.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <project name="mt8127/android_device_alcatel_ttab" path="device/alcatel/ttab" remote="github" revision="cm-14.1" />
-  <project name="mt8127/android_kernel_alcatel_ttab" path="kernel/alcatel/ttab" remote="github" revision="cm-14.1" />
-  <project name="mt8127/android_vendor_alcatel_ttab" path="vendor/alcatel/ttab" remote="github" revision="cm-14.1" />
-  <project name="LineageOS/android_external_stlport" path="external/stlport" remote="github" revision="cm-14.1" />
-  <project name="Stricted/android_vendor_extra" path="vendor/extra" remote="github" revision="cm-14.1" />
-</manifest>

diff --git a/manifests/lineage-14.1.xml b/manifests/lineage-14.1.xml
new file mode 100644 (file)
index 0000000..23e58ac
--- /dev/null
+++ b/manifests/lineage-14.1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <project name="mt8127/android_device_alcatel_ttab" path="device/alcatel/ttab" remote="github" revision="cm-14.1" />
+  <project name="mt8127/android_kernel_alcatel_ttab" path="kernel/alcatel/ttab" remote="github" revision="cm-14.1" />
+  <project name="mt8127/android_vendor_alcatel_ttab" path="vendor/alcatel/ttab" remote="github" revision="cm-14.1" />
+  <project name="LineageOS/android_external_stlport" path="external/stlport" remote="github" revision="cm-14.1" />
+  <project name="Stricted/android_vendor_extra" path="vendor/extra" remote="github" revision="cm-14.1" />
+</manifest>

diff --git a/manifests/lineage-15.1-s5neolte.xml b/manifests/lineage-15.1-s5neolte.xml
deleted file mode 100644 (file)
index d0b10e2..0000000
--- a/manifests/lineage-15.1-s5neolte.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch="https://gitlab.com" name="gitlab" />
-  <project name="Exynos7580/android_device_samsung_universal7580-common" path="device/samsung/universal7580-common" remote="gitlab" revision="lineage-15.1" />
-  <project name="Exynos7580/android_kernel_samsung_universal7580" path="kernel/samsung/universal7580" remote="gitlab" revision="lineage-15.1" />
-  <project name="Exynos7580/android_vendor_samsung_universal7580-common" path="vendor/samsung/universal7580-common" remote="gitlab" revision="lineage-15.1" />
-  <project name="Exynos7580/android_device_samsung_s5neolte" path="device/samsung/s5neolte" remote="gitlab" revision="lineage-15.1" />
-  <project name="Exynos7580/android_vendor_samsung_s5neolte" path="vendor/samsung/s5neolte" remote="gitlab" revision="lineage-15.1" />
-  <project name="LineageOS/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-15.1" />
-  <project name="LineageOS/android_packages_resources_devicesettings" path="packages/resources/devicesettings" remote="github" revision="lineage-15.1"/>
-  <project name="LineageOS/android_packages_apps_FlipFlap" path="packages/apps/FlipFlap" remote="github" revision="lineage-15.1"/>
-  <project name="Stricted/android_vendor_extra" path="vendor/extra" remote="github" revision="lineage-15.1" />
-</manifest>

diff --git a/manifests/lineage-15.1.xml b/manifests/lineage-15.1.xml
new file mode 100644 (file)
index 0000000..d0b10e2
--- /dev/null
+++ b/manifests/lineage-15.1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote fetch="https://gitlab.com" name="gitlab" />
+  <project name="Exynos7580/android_device_samsung_universal7580-common" path="device/samsung/universal7580-common" remote="gitlab" revision="lineage-15.1" />
+  <project name="Exynos7580/android_kernel_samsung_universal7580" path="kernel/samsung/universal7580" remote="gitlab" revision="lineage-15.1" />
+  <project name="Exynos7580/android_vendor_samsung_universal7580-common" path="vendor/samsung/universal7580-common" remote="gitlab" revision="lineage-15.1" />
+  <project name="Exynos7580/android_device_samsung_s5neolte" path="device/samsung/s5neolte" remote="gitlab" revision="lineage-15.1" />
+  <project name="Exynos7580/android_vendor_samsung_s5neolte" path="vendor/samsung/s5neolte" remote="gitlab" revision="lineage-15.1" />
+  <project name="LineageOS/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-15.1" />
+  <project name="LineageOS/android_packages_resources_devicesettings" path="packages/resources/devicesettings" remote="github" revision="lineage-15.1"/>
+  <project name="LineageOS/android_packages_apps_FlipFlap" path="packages/apps/FlipFlap" remote="github" revision="lineage-15.1"/>
+  <project name="Stricted/android_vendor_extra" path="vendor/extra" remote="github" revision="lineage-15.1" />
+</manifest>

diff --git a/manifests/lineage-17.1.xml b/manifests/lineage-17.1.xml
new file mode 100644 (file)
index 0000000..7ac70f1
--- /dev/null
+++ b/manifests/lineage-17.1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <project name="exynos8895/android_device_samsung_dreamlte" path="device/samsung/dreamlte" remote="github" revision="lineage-17.1" />
+  <project name="exynos8895/android_device_samsung_dream2lte" path="device/samsung/dream2lte" remote="github" revision="lineage-17.1" />
+  <project name="exynos8895/android_device_samsung_greatlte" path="device/samsung/greatlte" remote="github" revision="lineage-17.1" />
+  <project name="exynos8895/android_device_samsung_universal8895-common" path="device/samsung/universal8895-common" remote="github" revision="lineage-17.1" />
+  <project name="exynos8895/android_kernel_samsung_universal8895" path="kernel/samsung/universal8895" remote="github" revision="lineage-17.1" />
+  <project name="exynos8895/android_vendor_samsung_universal8895-common" path="vendor/samsung/universal8895-common" remote="github" revision="lineage-17.1" />
+  <project name="exynos8895/android_vendor_samsung_dreamlte" path="vendor/samsung/dreamlte" remote="github" revision="lineage-17.1" />
+  <project name="exynos8895/android_vendor_samsung_dream2lte" path="vendor/samsung/dream2lte" remote="github" revision="lineage-17.1" />
+  <project name="exynos8895/android_vendor_samsung_greatlte" path="vendor/samsung/greatlte" remote="github" revision="lineage-17.1" />
+  <project name="LineageOS/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-17.1" />
+  <project name="Stricted/android_vendor_extra" path="vendor/extra" remote="github" revision="lineage-17.1" />
+</manifest>
\ No newline at end of file

diff --git a/targets.json b/targets.json
index be4e69aaaa88f8a44477b6c413323b5213b760d5..eee994ec733f831a57e2fb6f95c344ecbe6476d8 100644 (file)
--- a/targets.json
+++ b/targets.json
@@ -8,5 +8,20 @@
                "device": "ttab",
                "version": "14.1",
                "build_type": "userdebug"
+       },
+       {
+               "device": "dreamlte",
+               "version": "17.1",
+               "build_type": "userdebug"
+       },
+       {
+               "device": "dream2lte",
+               "version": "17.1",
+               "build_type": "userdebug"
+       },
+       {
+               "device": "greatlte",
+               "version": "17.1",
+               "build_type": "userdebug"
        }
 ]
\ No newline at end of file