Merge branch 'q10.0' of https://github.com/AICP/platform_manifest into q10.0

Change-Id: Iefe8fe9fa54657eb8aabeea3c37d56df33cd1487

diff --git a/aicp-caf.xml b/aicp-caf.xml
index 43df1a4..529ce64 100644 (file)
--- a/aicp-caf.xml
+++ b/aicp-caf.xml
@@ -7,62 +7,20 @@
   <project path="external/ant-wireless/antradio-library" name="LineageOS/android_external_ant-wireless_antradio-library" remote="lineage" />\r
   <project path="external/connectivity" name="LineageOS/android_external_connectivity" groups="qcom,pdk-qcom" remote="lineage" />\r
   <project path="external/json-c" name="LineageOS/android_external_json-c" groups="qcom,pdk-qcom" remote="lineage" />\r
-  <project path="hardware/qcom-caf/apq8084/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.1-caf-apq8084" remote="lineage" />\r
-  <project path="hardware/qcom-caf/apq8084/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" revision="lineage-17.1-caf-apq8084" remote="lineage" />\r
-  <project path="hardware/qcom-caf/apq8084/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" revision="lineage-17.1-caf-apq8084" remote="lineage" />\r
   <project path="hardware/qcom-caf/common" name="LineageOS/android_hardware_qcom-caf_common" groups="qcom,pdk-qcom" remote="lineage" >\r
     <!-- add guard for AOSP hardware/qcom dir -->\r
     <linkfile src="os_pickup_aosp.mk" dest="hardware/qcom/Android.mk" />\r
-    <!-- for AOSP sdm845, we override os_pickup.mk -->\r
-    <linkfile src="os_pickup.mk" dest="hardware/qcom/sdm845/Android.mk" />\r
     <!-- add guards for CAF repositories -->\r
-    <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/apq8084/Android.mk" />\r
-    <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8916/Android.mk" />\r
-    <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8952/Android.mk" />\r
-    <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8960/Android.mk" />\r
-    <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8974/Android.mk" />\r
-    <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8994/Android.mk" />\r
-    <linkfile src="os_pickup.bp" dest="hardware/qcom-caf/msm8996/Android.bp" />\r
-    <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8996/Android.mk" />\r
     <linkfile src="os_pickup.bp" dest="hardware/qcom-caf/msm8998/Android.bp" />\r
     <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8998/Android.mk" />\r
-    <linkfile src="os_pickup.bp" dest="hardware/qcom-caf/sdm845/Android.bp" />\r
-    <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sdm845/Android.mk" />\r
-    <linkfile src="os_pickup.bp" dest="hardware/qcom-caf/sm8150/Android.bp" />\r
-    <linkfile src="os_pickup.mk" dest="hardware/qcom-caf/sm8150/Android.mk" />\r
     <linkfile src="os_pickup.bp" dest="vendor/nxp/opensource/pn5xx/Android.bp" />\r
     <linkfile src="os_pickup.mk" dest="vendor/nxp/opensource/pn5xx/Android.mk" />\r
     <linkfile src="os_pickup.bp" dest="vendor/nxp/opensource/sn100x/Android.bp" />\r
     <linkfile src="os_pickup.mk" dest="vendor/nxp/opensource/sn100x/Android.mk" />\r
   </project>\r
   <project path="hardware/qcom-caf/bt" name="LineageOS/android_hardware_qcom_bt" groups="qcom,pdk-qcom" revision="lineage-17.1-caf" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8916/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.1-caf-msm8916" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8916/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" revision="lineage-17.1-caf-msm8916" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8916/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" revision="lineage-17.1-caf-msm8916" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8952/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.1-caf-msm8952" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8952/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" revision="lineage-17.1-caf-msm8952" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8952/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" revision="lineage-17.1-caf-msm8952" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8960/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.1-caf-msm8960" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8960/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" revision="lineage-17.1-caf-msm8960" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8960/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" revision="lineage-17.1-caf-msm8960" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8974/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.1-caf-msm8974" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8974/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" revision="lineage-17.1-caf-msm8974" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8974/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" revision="lineage-17.1-caf-msm8974" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8994/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.1-caf-msm8994" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8994/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" revision="lineage-17.1-caf-msm8994" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8994/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" revision="lineage-17.1-caf-msm8994" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8996/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.1-caf-msm8996" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8996/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" revision="lineage-17.1-caf-msm8996" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8996/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" revision="lineage-17.1-caf-msm8996" remote="lineage" />\r
-  <project path="hardware/qcom-caf/msm8998/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.1-caf-msm8998" remote="lineage" />\r
   <project path="hardware/qcom-caf/msm8998/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" revision="lineage-17.1-caf-msm8998" remote="lineage" />\r
   <project path="hardware/qcom-caf/msm8998/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" revision="lineage-17.1-caf-msm8998" remote="lineage" />\r
-  <project path="hardware/qcom-caf/sdm845/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.1-caf-sdm845" remote="lineage" />\r
-  <project path="hardware/qcom-caf/sdm845/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" revision="lineage-17.1-caf-sdm845" remote="lineage" />\r
-  <project path="hardware/qcom-caf/sdm845/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" revision="lineage-17.1-caf-sdm845" remote="lineage" />\r
-  <project path="hardware/qcom-caf/sm8150/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.1-caf-sm8150" remote="lineage" />\r
-  <project path="hardware/qcom-caf/sm8150/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" revision="lineage-17.1-caf-sm8150" remote="lineage" />\r
-  <project path="hardware/qcom-caf/sm8150/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" revision="lineage-17.1-caf-sm8150" remote="lineage" />\r
   <project path="hardware/qcom-caf/thermal" name="LineageOS/android_hardware_qcom_thermal" groups="qcom,pdk-qcom" remote="lineage" />\r
   <project path="hardware/qcom-caf/vr" name="LineageOS/android_hardware_qcom_vr" groups="qcom,pdk-qcom" remote="lineage" />\r
   <project path="hardware/qcom-caf/wlan" name="LineageOS/android_hardware_qcom_wlan" groups="qcom_wlan,pdk-qcom" revision="lineage-17.1-caf" remote="lineage" />\r

diff --git a/aicp-sagit.xml b/aicp-sagit.xml
new file mode 100644 (file)
index 0000000..236f537
--- /dev/null
+++ b/aicp-sagit.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <remote  name="caf"
+           fetch="https://source.codeaurora.org/quic/la"
+           review="codeaurora.org"
+           revision="refs/tags/LA.UM.8.11.r1-02100-NICOBAR.0"
+           clone-depth="1"
+           sync-j="4" />
+
+  <remove-project name="AICP/external_tinycompress" />
+
+  <project name="platform/external/tinycompress" path="external/tinycompress" remote="caf" />
+
+  <!-- Hardware repos -->
+  <project path="vendor/qcom/opensource/audio-hal/primary-hal" name="AOSP-10/hardware_qcom_audio_msm8998" revision="10" remote="github" clone-depth="1" />
+
+</manifest>

diff --git a/aicp_package.xml b/aicp_package.xml
new file mode 100644 (file)
index 0000000..80858e4
--- /dev/null
+++ b/aicp_package.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <remove-project name="AICP/packages_apps_Jelly" />
+
+  <project path="packages/apps/DuckDuckGo" name="0ranko0P/android_packages_apps_DuckDuckGo" remote="gitlab" revision="10" clone-depth="1" />
+
+</manifest>

diff --git a/default.xml b/default.xml
index d5b0428..6c66ba1 100644 (file)
--- a/default.xml
+++ b/default.xml
@@ -779,4 +779,23 @@
   <!-- AICP -->\r
   <include name="aicp-default.xml" />\r
 \r
+  <!-- Untrack car repos -->\r
+  <include name="remove_car.xml" />\r
+\r
+  <!-- Untrack darwin repos -->\r
+  <include name="remove_darwin.xml" />\r
+\r
+  <!-- Untrack some hardware that i do not need -->\r
+  <include name="remove_hardware.xml" />\r
+\r
+  <!-- some packages-->\r
+  <include name="aicp_package.xml" />\r
+\r
+  <!-- Audio fix for sagit -->\r
+  <!-- Todo: remove -->\r
+  <include name="aicp-sagit.xml" />\r
+\r
+  <!-- Untrack some device -->\r
+  <include name="remove_device.xml" />\r
+\r
 </manifest>\r

diff --git a/remove.xml b/remove.xml
index 412cc7c..46f04f0 100644 (file)
--- a/remove.xml
+++ b/remove.xml
@@ -1,7 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <manifest>\r
 \r
+  <remove-project name="device/amlogic/yukawa" />\r
+  <remove-project name="device/amlogic/yukawa-kernel" />\r
   <remove-project name="device/generic/goldfish" />\r
+  <remove-project name="device/generic/goldfish-opengl" />\r
+  <remove-project name="device/generic/car" />\r
+  <remove-project name="device/generic/qemu" />\r
+  <remove-project name="device/generic/x86" />\r
+  <remove-project name="device/generic/x86_64" />\r
+  <remove-project name="device/generic/opengl-transport" />\r
+  <remove-project name="device/google/atv" />\r
+  <remove-project name="device/google/contexthub" />\r
+  <remove-project name="device/google/bonito" />\r
+  <remove-project name="device/google/bonito-kernel" />\r
+  <remove-project name="device/google/bonito-sepolicy" />\r
+  <remove-project name="device/google/crosshatch" />\r
+  <remove-project name="device/google/crosshatch-kernel" />\r
+  <remove-project name="device/google/crosshatch-sepolicy" />\r
+  <remove-project name="device/google/cuttlefish" />\r
+  <remove-project name="device/google/cuttlefish_common" />\r
+  <remove-project name="device/google/cuttlefish_kernel" />\r
+  <remove-project name="device/google/cuttlefish_vmm" />\r
+  <remove-project name="device/google/marlin" />\r
+  <remove-project name="device/google/marlin-kernel" />\r
+  <remove-project name="device/google/muskie" />\r
+  <remove-project name="device/google/taimen" />\r
+  <remove-project name="device/google/vrservices" />\r
+  <remove-project name="device/google/wahoo" />\r
+  <remove-project name="device/google/wahoo-kernel" />\r
+  <remove-project name="device/google/fuchsia" />\r
+  <remove-project name="device/linaro/bootloader/arm-trusted-firmware" />\r
+  <remove-project name="device/linaro/bootloader/edk2" />\r
+  <remove-project name="device/linaro/bootloader/OpenPlatformPkg" />\r
+  <remove-project name="device/linaro/hikey" />\r
+  <remove-project name="device/linaro/hikey-kernel" />\r
+  <remove-project name="device/linaro/poplar" />\r
+  <remove-project name="device/linaro/poplar-kernel" />\r
+  <remove-project name="device/sample" />\r
+  <remove-project name="device/ti/beagle-x15" />\r
+  <remove-project name="device/ti/beagle-x15-kernel" />\r
+\r
+  <!-- General repos -->\r
+  <remove-project name="kernel/tests" />\r
+\r
+  <!-- hardware repos -->\r
+  <remove-project name="platform/hardware/qcom/msm8x26" />\r
+  <remove-project name="platform/hardware/qcom/msm8x27" />\r
+  <remove-project name="platform/hardware/qcom/msm8x84" />\r
+  <remove-project name="platform/hardware/qcom/msm8x09" />\r
+\r
   <remove-project name="platform/art" />\r
   <remove-project name="platform/bionic" />\r
   <remove-project name="platform/bootable/recovery" />\r

diff --git a/remove_car.xml b/remove_car.xml
new file mode 100644 (file)
index 0000000..e43cc13
--- /dev/null
+++ b/remove_car.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+       <!-- Not building for cars... -->
+       <remove-project name="platform/packages/apps/Car/Cluster" />
+       <remove-project name="platform/packages/apps/Car/Dialer" />
+       <remove-project name="platform/packages/apps/Car/Hvac" />
+       <remove-project name="platform/packages/apps/Car/LatinIME" />
+       <remove-project name="platform/packages/apps/Car/Launcher" />
+       <remove-project name="platform/packages/apps/Car/LensPicker" />
+       <remove-project name="platform/packages/apps/Car/LinkViewer" />
+       <!-- PackageInstaller depends on car-list, which is in the libs: -->
+       <!--<remove-project name="platform/packages/apps/Car/libs" />-->
+       <remove-project name="platform/packages/apps/Car/LocalMediaPlayer" />
+       <remove-project name="platform/packages/apps/Car/Media" />
+       <remove-project name="platform/packages/apps/Car/Messenger" />
+       <!--
+       frameworks/base/packages/CarSystemUI (which cannot be untracked)
+       depends on the Notification package.
+       -->
+       <!-- <remove-project name="platform/packages/apps/Car/Notification" /> -->
+       <remove-project name="platform/packages/apps/Car/Overview" />
+       <remove-project name="platform/packages/apps/Car/Radio" />
+       <remove-project name="platform/packages/apps/Car/Settings" />
+       <remove-project name="platform/packages/apps/Car/Stream" />
+       <remove-project name="platform/packages/apps/Car/SystemUpdater" />
+       <remove-project name="platform/packages/apps/Car/externallibs" />
+       <remove-project name="platform/packages/apps/Car/tests" />
+</manifest>

diff --git a/remove_darwin.xml b/remove_darwin.xml
new file mode 100644 (file)
index 0000000..8ba2f84
--- /dev/null
+++ b/remove_darwin.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+       <remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_aarch64_aarch64-linux-android-4.9" />
+        <remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_arm_arm-linux-androideabi-4.9" />
+       <remove-project name="platform/prebuilts/clang/host/darwin-x86" />
+       <remove-project name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" />
+       <remove-project name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" />
+       <remove-project name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" />
+       <remove-project name="platform/prebuilts/gdb/darwin-x86" />
+       <remove-project name="platform/prebuilts/go/darwin-x86" />
+       <remove-project name="platform/prebuilts/python/darwin-x86/2.7.5" />
+</manifest>

diff --git a/remove_device.xml b/remove_device.xml
new file mode 100644 (file)
index 0000000..cf38787
--- /dev/null
+++ b/remove_device.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <remove-project name="LineageOS/android_device_generic_goldfish" />
+
+</manifest>

diff --git a/remove_hardware.xml b/remove_hardware.xml
new file mode 100644 (file)
index 0000000..f45521c
--- /dev/null
+++ b/remove_hardware.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <remove-project name="platform/hardware/qcom/msm8960" />
+  <remove-project name="platform/hardware/qcom/msm8994" />
+  <remove-project name="platform/hardware/qcom/msm8998" />
+
+  <remove-project name="LineageOS/android_hardware_qcom_sdm845_display" />
+  <remove-project name="platform/hardware/qcom/sdm845/bt" />
+  <remove-project name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" />
+  <remove-project name="platform/hardware/qcom/sdm845/gps" />
+  <remove-project name="platform/hardware/qcom/sdm845/media" />
+  <remove-project name="platform/hardware/qcom/sdm845/thermal" />
+  <remove-project name="platform/hardware/qcom/sdm845/vr" />
+
+  <remove-project name="platform/hardware/qcom/sm8150/data/ipacfg-mgr" />
+  <remove-project name="platform/hardware/qcom/sm8150/display" />
+  <remove-project name="platform/hardware/qcom/sm8150/gps" />
+  <remove-project name="platform/hardware/qcom/sm8150/media" />
+  <remove-project name="platform/hardware/qcom/sm8150/thermal" />
+  <remove-project name="platform/hardware/qcom/sm8150/vr" />
+
+</manifest>