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

Change-Id: I0999c5c6a32859976e00d4e5601749d872fdb1bb

diff --git a/aicp-aosp.xml b/aicp-aosp.xml
index a5fc866..2992594 100644 (file)
--- a/aicp-aosp.xml
+++ b/aicp-aosp.xml
@@ -37,49 +37,49 @@
   <project path="system/update_engine" name="AICP/system_update_engine" groups="pdk" remote="aicp" />\r
 \r
   <!-- LineageOS AOSP Repos -->\r
-  <project path="art" name="LineageOS/android_art" groups="pdk" remote="lineagestaging" />\r
-  <project path="build/blueprint" name="LineageOS/android_build_blueprint" groups="pdk,tradefed" remote="lineagestaging" />\r
-  <project path="device/generic/goldfish" name="LineageOS/android_device_generic_goldfish" groups="pdk" remote="lineagestaging" />\r
+  <project path="art" name="LineageOS/android_art" groups="pdk" remote="lineage" />\r
+  <project path="build/blueprint" name="LineageOS/android_build_blueprint" groups="pdk,tradefed" remote="lineage" />\r
+  <project path="device/generic/goldfish" name="LineageOS/android_device_generic_goldfish" groups="pdk" remote="lineage" />\r
   <project path="external/e2fsprogs" name="LineageOS/android_external_e2fsprogs" 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="lineagestaging" />\r
-  <project path="external/selinux" name="LineageOS/android_external_selinux" groups="pdk" remote="lineagestaging" />\r
-  <project path="external/tinyalsa" name="LineageOS/android_external_tinyalsa" groups="pdk" remote="lineagestaging" />\r
-  <project path="frameworks/opt/net/wifi" name="LineageOS/android_frameworks_opt_net_wifi" groups="pdk" remote="lineagestaging" />\r
-  <project path="frameworks/opt/telephony" name="LineageOS/android_frameworks_opt_telephony" groups="pdk" remote="lineagestaging" />\r
-  <project path="hardware/broadcom/libbt" name="LineageOS/android_hardware_broadcom_libbt" groups="pdk" remote="lineagestaging" />\r
+  <project path="external/mksh" name="LineageOS/android_external_mksh" groups="pdk" remote="lineage" />\r
+  <project path="external/selinux" name="LineageOS/android_external_selinux" groups="pdk" remote="lineage" />\r
+  <project path="external/tinyalsa" name="LineageOS/android_external_tinyalsa" groups="pdk" remote="lineage" />\r
+  <project path="frameworks/opt/net/wifi" name="LineageOS/android_frameworks_opt_net_wifi" groups="pdk" remote="lineage" />\r
+  <project path="frameworks/opt/telephony" name="LineageOS/android_frameworks_opt_telephony" groups="pdk" remote="lineage" />\r
+  <project path="hardware/broadcom/libbt" name="LineageOS/android_hardware_broadcom_libbt" groups="pdk" remote="lineage" />\r
   <project path="hardware/broadcom/nfc" name="LineageOS/android_hardware_broadcom_nfc" remote="lineage" />\r
-  <project path="hardware/libhardware" name="LineageOS/android_hardware_libhardware" groups="pdk" remote="lineagestaging" />\r
-  <project path="hardware/libhardware_legacy" name="LineageOS/android_hardware_libhardware_legacy" groups="pdk" remote="lineagestaging" />\r
-  <project path="hardware/nxp/nfc" name="LineageOS/android_hardware_nxp_nfc" groups="pdk" remote="lineagestaging" />\r
-  <project path="hardware/qcom/bootctrl" name="LineageOS/android_hardware_qcom_bootctrl" groups="pdk-qcom" remote="lineagestaging" />\r
-  <project path="hardware/qcom/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" remote="lineagestaging" />\r
-  <project path="hardware/qcom/bt" name="LineageOS/android_hardware_qcom_bt" groups="qcom,pdk-qcom" remote="lineagestaging" />\r
-  <project path="hardware/qcom/data/ipacfg-mgr" name="LineageOS/android_hardware_qcom_data_ipacfg-mgr" groups="qcom,pdk-qcom" remote="lineagestaging" />\r
-  <project path="hardware/qcom/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" remote="lineagestaging" />\r
-  <project path="hardware/qcom/gps" name="LineageOS/android_hardware_qcom_gps" groups="qcom,qcom_gps,pdk-qcom" remote="lineagestaging" />\r
-  <project path="hardware/qcom/keymaster" name="LineageOS/android_hardware_qcom_keymaster" groups="qcom,qcom_keymaster,pdk-qcom" remote="lineagestaging" />\r
-  <project path="hardware/qcom/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" remote="lineagestaging" />\r
-  <project path="hardware/qcom/sdm845/display" name="LineageOS/android_hardware_qcom_sdm845_display" groups="qcom_sdm845" remote="lineagestaging" />\r
-  <project path="hardware/ril" name="LineageOS/android_hardware_ril" groups="pdk" remote="lineagestaging" />\r
-  <project path="packages/apps/Contacts" name="LineageOS/android_packages_apps_Contacts" groups="apps_nfc,pdk-fs" remote="lineagestaging" />\r
-  <project path="packages/apps/Email" name="LineageOS/android_packages_apps_Email" groups="apps_nfc,pdk-fs" remote="lineagestaging" />\r
+  <project path="hardware/libhardware" name="LineageOS/android_hardware_libhardware" groups="pdk" remote="lineage" />\r
+  <project path="hardware/libhardware_legacy" name="LineageOS/android_hardware_libhardware_legacy" groups="pdk" remote="lineage" />\r
+  <project path="hardware/nxp/nfc" name="LineageOS/android_hardware_nxp_nfc" groups="pdk" remote="lineage" />\r
+  <project path="hardware/qcom/bootctrl" name="LineageOS/android_hardware_qcom_bootctrl" groups="pdk-qcom" remote="lineage" />\r
+  <project path="hardware/qcom/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" remote="lineage" />\r
+  <project path="hardware/qcom/bt" name="LineageOS/android_hardware_qcom_bt" groups="qcom,pdk-qcom" remote="lineage" />\r
+  <project path="hardware/qcom/data/ipacfg-mgr" name="LineageOS/android_hardware_qcom_data_ipacfg-mgr" groups="qcom,pdk-qcom" remote="lineage" />\r
+  <project path="hardware/qcom/display" name="LineageOS/android_hardware_qcom_display" groups="pdk-qcom,qcom,qcom_display" remote="lineage" />\r
+  <project path="hardware/qcom/gps" name="LineageOS/android_hardware_qcom_gps" groups="qcom,qcom_gps,pdk-qcom" remote="lineage" />\r
+  <project path="hardware/qcom/keymaster" name="LineageOS/android_hardware_qcom_keymaster" groups="qcom,qcom_keymaster,pdk-qcom" remote="lineage" />\r
+  <project path="hardware/qcom/media" name="LineageOS/android_hardware_qcom_media" groups="qcom,pdk-qcom" remote="lineage" />\r
+  <project path="hardware/qcom/sdm845/display" name="LineageOS/android_hardware_qcom_sdm845_display" groups="qcom_sdm845" remote="lineage" />\r
+  <project path="hardware/ril" name="LineageOS/android_hardware_ril" groups="pdk" remote="lineage" />\r
+  <project path="packages/apps/Contacts" name="LineageOS/android_packages_apps_Contacts" groups="apps_nfc,pdk-fs" remote="lineage" />\r
+  <project path="packages/apps/Email" name="LineageOS/android_packages_apps_Email" groups="apps_nfc,pdk-fs" remote="lineage" />\r
   <project path="packages/apps/Exchange" name="LineageOS/android_packages_apps_Exchange" groups="apps_nfc,pdk-fs" remote="lineage" />\r
   <project path="packages/apps/FMRadio" name="LineageOS/android_packages_apps_FMRadio" remote="lineage" />\r
-  <project path="packages/apps/Messaging" name="LineageOS/android_packages_apps_Messaging" groups="apps_nfc,pdk-fs" remote="lineagestaging" />\r
-  <project path="packages/apps/Nfc" name="LineageOS/android_packages_apps_Nfc" groups="apps_nfc,pdk-fs" remote="lineagestaging" />\r
-  <project path="packages/apps/UnifiedEmail" name="LineageOS/android_packages_apps_UnifiedEmail" groups="apps_nfc,pdk-fs" remote="lineagestaging" />\r
-  <project path="packages/apps/PermissionController" name="LineageOS/android_packages_apps_PackageInstaller" groups="pdk-cw-fs,pdk-fs" remote="lineagestaging" />\r
-  <project path="packages/apps/SettingsIntelligence" name="LineageOS/android_packages_apps_SettingsIntelligence" groups="pdk-fs" remote="lineagestaging" />\r
-  <project path="packages/providers/ContactsProvider" name="LineageOS/android_packages_providers_ContactsProvider" groups="pdk-cw-fs,pdk-fs" remote="lineagestaging" />\r
-  <project path="platform_testing" name="LineageOS/android_platform_testing" groups="pdk-fs,pdk-cw-fs,cts" remote="lineagestaging" />\r
+  <project path="packages/apps/Messaging" name="LineageOS/android_packages_apps_Messaging" groups="apps_nfc,pdk-fs" remote="lineage" />\r
+  <project path="packages/apps/Nfc" name="LineageOS/android_packages_apps_Nfc" groups="apps_nfc,pdk-fs" remote="lineage" />\r
+  <project path="packages/apps/PermissionController" name="LineageOS/android_packages_apps_PackageInstaller" groups="pdk-cw-fs,pdk-fs" remote="lineage" />\r
+  <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="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
   <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="LineageOS/android_prebuilts_gcc_linux-x86_aarch64_aarch64-linux-android-4.9" groups="pdk,linux,arm" clone-depth="1" remote="lineage" />\r
   <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/bt" name="LineageOS/android_system_bt" groups="pdk" remote="lineagestaging" />\r
+  <project path="system/bt" name="LineageOS/android_system_bt" groups="pdk" remote="lineage" />\r
   <project path="system/keymaster" name="LineageOS/android_system_keymaster" groups="pdk" remote="lineage" />\r
 \r
 </manifest>\r

diff --git a/aicp-default.xml b/aicp-default.xml
index 4fd2aec..377419a 100644 (file)
--- a/aicp-default.xml
+++ b/aicp-default.xml
@@ -10,13 +10,7 @@
   <remote  name="lineage"\r
            fetch="git://github.com/"\r
            review="review.lineageos.org"\r
-           revision="refs/heads/lineage-17.0"\r
-           sync-j="8" />\r
-\r
-  <remote  name="lineagestaging"\r
-           fetch="git://github.com/"\r
-           review="review.lineageos.org"\r
-           revision="refs/heads/staging/lineage-17.0_merge-android-10.0.0_r9"\r
+           revision="refs/heads/lineage-17.1"\r
            sync-j="8" />\r
 \r
   <remote  name="omni"\r
@@ -67,7 +61,7 @@
   <project path="external/libncurses" name="LineageOS/android_external_libncurses" remote="lineage" />\r
   <project path="external/nano" name="LineageOS/android_external_nano" remote="lineage" />\r
   <project path="external/ntfs-3g" name="LineageOS/android_external_ntfs-3g" remote="lineage" />\r
-  <project path="external/openssh" name="LineageOS/android_external_openssh" groups="pdk" remote="lineagestaging" />\r
+  <project path="external/openssh" name="LineageOS/android_external_openssh" groups="pdk" remote="lineage" />\r
   <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