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

Change-Id: Iefe8fe9fa54657eb8aabeea3c37d56df33cd1487

diff --git a/aicp-aosp.xml b/aicp-aosp.xml
index 1171875..bf5adfa 100644 (file)
--- a/aicp-aosp.xml
+++ b/aicp-aosp.xml
@@ -24,6 +24,7 @@
   <project path="frameworks/native" name="AICP/frameworks_native" groups="pdk-cw-fs,pdk-fs" remote="aicp" />\r
   <project path="hardware/interfaces" name="AICP/hardware_interfaces" groups="pdk" remote="aicp" />\r
   <project path="hardware/libhardware" name="AICP/hardware_libhardware" groups="pdk" remote="aicp" />\r
+  <project path="packages/apps/Bluetooth" name="AICP/packages_apps_Bluetooth" groups="pdk-cw-fs,pdk-fs" remote="aicp" />\r
   <project path="packages/apps/Contacts" name="AICP/packages_apps_Contacts" groups="apps_nfc,pdk-fs" remote="aicp" />\r
   <project path="packages/apps/DeskClock" name="AICP/packages_apps_DeskClock" groups="pdk-fs" remote="aicp" />\r
   <project path="packages/apps/Dialer" name="AICP/packages_apps_Dialer" groups="pdk-fs" remote="aicp" />\r
@@ -73,6 +74,7 @@
   <project path="packages/apps/SettingsIntelligence" name="LineageOS/android_packages_apps_SettingsIntelligence" groups="pdk-fs" remote="lineage" />\r
   <project path="packages/apps/UnifiedEmail" name="LineageOS/android_packages_apps_UnifiedEmail" groups="apps_nfc,pdk-fs" remote="lineage" />\r
   <project path="packages/providers/ContactsProvider" name="LineageOS/android_packages_providers_ContactsProvider" groups="pdk-cw-fs,pdk-fs" remote="lineage" />\r
+  <project path="packages/services/BuiltInPrintService" name="LineageOS/android_packages_services_BuiltInPrintService" groups="pdk-cw-fs,pdk-fs" remote="lineage" />\r
   <project path="platform_testing" name="LineageOS/android_platform_testing" groups="pdk-fs,pdk-cw-fs,cts" remote="lineage" />\r
   <project path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" name="LineageOS/android_prebuilts_gcc_darwin-x86_aarch64_aarch64-linux-android-4.9" groups="pdk,darwin,arm" clone-depth="1" remote="lineage" />\r
   <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" name="LineageOS/android_prebuilts_gcc_darwin-x86_arm_arm-linux-androideabi-4.9" groups="pdk,darwin,arm" clone-depth="1" remote="lineage" />\r

diff --git a/aicp-default.xml b/aicp-default.xml
index a3bb218..6106746 100644 (file)
--- a/aicp-default.xml
+++ b/aicp-default.xml
@@ -67,6 +67,7 @@
   <project path="external/p7zip" name="LineageOS/android_external_p7zip" remote="lineage" />\r
   <project path="external/pigz" name="LineageOS/android_external_pigz" remote="lineage" />\r
   <project path="external/rsync" name="LineageOS/android_external_rsync" remote="lineage" />\r
+  <project path="external/toybox" name="LineageOS/android_external_toybox" remote="lineage" />\r
   <project path="external/unrar" name="LineageOS/android_external_unrar" remote="lineage" />\r
   <project path="external/vim" name="LineageOS/android_external_vim" remote="lineage" />\r
   <project path="external/zip" name="LineageOS/android_external_zip" remote="lineage" />\r
@@ -75,6 +76,5 @@
   <project path="system/tools/dtbtool" name="LineageOS/android_system_tools_dtbtool" remote="lineage" />\r
 \r
   <!-- Omni additions -->\r
-  <project path="packages/apps/omniRecord" name="omnirom/android_packages_apps_omniRecord" remote="omni" />\r
   <project path="packages/apps/Phonograph" name="omnirom/android_packages_apps_Phonograph" remote="omni" />\r
 </manifest>\r

diff --git a/remove.xml b/remove.xml
index fc76b00..46f04f0 100644 (file)
--- a/remove.xml
+++ b/remove.xml
@@ -62,6 +62,7 @@
   <remove-project name="platform/external/selinux" />\r
   <remove-project name="platform/external/tinyalsa" />\r
   <remove-project name="platform/external/tinycompress" />\r
+  <remove-project name="platform/external/toybox" />\r
   <remove-project name="platform/frameworks/av" />\r
   <remove-project name="platform/frameworks/base" />\r
   <remove-project name="platform/frameworks/native" />\r
@@ -83,6 +84,7 @@
   <remove-project name="platform/hardware/qcom/power" />\r
   <remove-project name="platform/hardware/qcom/sdm845/display" />\r
   <remove-project name="platform/hardware/ril" />\r
+  <remove-project name="platform/packages/apps/Bluetooth" />\r
   <remove-project name="platform/packages/apps/Browser2" />\r
   <remove-project name="platform/packages/apps/Contacts" />\r
   <remove-project name="platform/packages/apps/DeskClock" />\r
@@ -101,6 +103,7 @@
   <remove-project name="platform/packages/providers/ContactsProvider" />\r
   <remove-project name="platform/packages/providers/DownloadProvider" />\r
   <remove-project name="platform/packages/providers/MediaProvider" />\r
+  <remove-project name="platform/packages/services/BuiltInPrintService" />\r
   <remove-project name="platform/packages/services/Telecomm" />\r
   <remove-project name="platform/packages/services/Telephony" />\r
   <remove-project name="platform/platform_testing" />\r