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

Change-Id: I40f25841b61bd5efd5c2b2bf9285e0d0831e52e4

diff --git a/aicp-aosp.xml b/aicp-aosp.xml
index 4faf5e1..3b48230 100644 (file)
--- a/aicp-aosp.xml
+++ b/aicp-aosp.xml
@@ -45,9 +45,12 @@
 \r
   <!-- LineageOS AOSP Repos -->\r
   <project path="build/blueprint" name="LineageOS/android_build_blueprint" groups="pdk,tradefed" remote="lineage" />\r
+  <project path="development" name="LineageOS/android_development" groups="developers,pdk-cw-fs,pdk-fs" remote="lineage" />\r
   <project path="device/generic/goldfish" name="LineageOS/android_device_generic_goldfish" groups="pdk" remote="lineage" />\r
   <project path="external/chromium-webview" name="LineageOS/android_external_chromium-webview" groups="pdk" remote="lineage" revision="master" clone-depth="1" />\r
   <project path="external/e2fsprogs" name="LineageOS/android_external_e2fsprogs" groups="pdk" remote="lineage" />\r
+  <project path="external/gptfdisk" name="LineageOS/android_external_gptfdisk" groups="pdk" remote="lineage" />\r
+  <project path="external/libcxx" name="LineageOS/android_external_libcxx" groups="pdk" remote="lineage" />\r
   <project path="external/libhevc" name="LineageOS/android_external_libhevc" groups="pdk" remote="lineage" />\r
   <project path="external/libnfc-nxp" name="LineageOS/android_external_libnfc-nxp" remote="lineage" />\r
   <project path="external/mksh" name="LineageOS/android_external_mksh" groups="pdk" remote="lineage" />\r
@@ -84,6 +87,7 @@
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="LineageOS/android_prebuilts_gcc_linux-x86_arm_arm-linux-androideabi-4.9" groups="pdk,linux,arm" clone-depth="1" remote="lineage" />\r
   <project path="prebuilts/r8" name="LineageOS/android_prebuilts_r8" groups="pdk" clone-depth="1" remote="lineage" />\r
   <project path="system/bpf" name="LineageOS/android_system_bpf" groups="pdk" remote="lineage" />\r
+  <project path="system/extras" name="LineageOS/android_system_extras" groups="pdk" remote="lineage" />\r
   <project path="system/hardware/interfaces" name="LineageOS/android_system_hardware_interfaces" groups="pdk" remote="lineage" />\r
   <project path="system/keymaster" name="LineageOS/android_system_keymaster" groups="pdk" remote="lineage" />\r
 \r

diff --git a/aicp-default.xml b/aicp-default.xml
index d8d6eaf..96e81c4 100644 (file)
--- a/aicp-default.xml
+++ b/aicp-default.xml
@@ -47,6 +47,7 @@
   <project path="packages/apps/JamesDSPManager" name="AICP/packages_apps_JamesDSPManager" remote="aicp" />\r
   <project path="packages/apps/Jelly" name="AICP/packages_apps_Jelly" remote="aicp" />\r
   <project path="packages/apps/Snap" name="AICP/packages_apps_Snap" remote="aicp" />\r
+  <project path="packages/apps/OmniStyle" name="AICP/packages_apps_OmniStyle" remote="aicp" />\r
   <project path="packages/apps/ThemePicker" name="AICP/packages_apps_ThemePicker" remote="aicp" />\r
   <project path="packages/apps/TilesWallpaper" name="AICP/packages_apps_TilesWallpaper" remote="aicp" />\r
   <project path="packages/apps/Updater" name="AICP/packages_apps_Updater" groups="pdk-fs" remote="aicp" />\r

diff --git a/default.xml b/default.xml
index 045d0d0..a68a546 100644 (file)
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
   <remote  name="aosp"\r
            fetch="https://android.googlesource.com"\r
            review="https://android-review.googlesource.com/" />\r
-  <default revision="refs/tags/android-10.0.0_r31"\r
+  <default revision="refs/tags/android-10.0.0_r33"\r
            remote="aosp"\r
            sync-c="true"\r
            sync-j="4" />\r

diff --git a/remove.xml b/remove.xml
index 6b23747..625119f 100644 (file)
--- a/remove.xml
+++ b/remove.xml
@@ -56,8 +56,11 @@
   <remove-project name="platform/build" />\r
   <remove-project name="platform/build/blueprint" />\r
   <remove-project name="platform/build/soong" />\r
+  <remove-project name="platform/development" />\r
   <remove-project name="platform/external/chromium-webview" />\r
   <remove-project name="platform/external/e2fsprogs" />\r
+  <remove-project name="platform/external/gptfdisk" />\r
+  <remove-project name="platform/external/libcxx" />\r
   <remove-project name="platform/external/libhevc" />\r
   <remove-project name="platform/external/mksh" />\r
   <remove-project name="platform/external/openssh" />\r
@@ -117,6 +120,7 @@
   <remove-project name="platform/system/bpf" />\r
   <remove-project name="platform/system/bt" />\r
   <remove-project name="platform/system/core" />\r
+  <remove-project name="platform/system/extras" />\r
   <remove-project name="platform/system/hardware/interfaces" />\r
   <remove-project name="platform/system/keymaster" />\r
   <remove-project name="platform/system/netd" />\r