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

Change-Id: I031a2adbd627556cbab23d2f39a59e5f22616982

diff --git a/aicp-aosp.xml b/aicp-aosp.xml
index 41ef98b..a5fc866 100644 (file)
--- a/aicp-aosp.xml
+++ b/aicp-aosp.xml
@@ -55,14 +55,12 @@
   <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/camera" name="LineageOS/android_hardware_qcom_camera" groups="qcom_camera,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="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/qcom/wlan" name="LineageOS/android_hardware_qcom_wlan" groups="qcom_wlan,pdk-qcom" remote="lineage" />\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

diff --git a/remove.xml b/remove.xml
index 9e0cf21..3b36721 100644 (file)
--- a/remove.xml
+++ b/remove.xml
@@ -75,7 +75,6 @@
   <remove-project name="platform/hardware/qcom/audio" />\r
   <remove-project name="platform/hardware/qcom/bootctrl" />\r
   <remove-project name="platform/hardware/qcom/bt" />\r
-  <remove-project name="platform/hardware/qcom/camera" />\r
   <remove-project name="platform/hardware/qcom/data/ipacfg-mgr" />\r
   <remove-project name="platform/hardware/qcom/display" />\r
   <remove-project name="platform/hardware/qcom/gps" />\r
@@ -83,7 +82,6 @@
   <remove-project name="platform/hardware/qcom/media" />\r
   <remove-project name="platform/hardware/qcom/power" />\r
   <remove-project name="platform/hardware/qcom/sdm845/display" />\r
-  <remove-project name="platform/hardware/qcom/wlan" />\r
   <remove-project name="platform/hardware/ril" />\r
   <remove-project name="platform/packages/apps/Browser2" />\r
   <remove-project name="platform/packages/apps/Contacts" />\r