Merge "manifest: add omniRecord" into q10.0

diff --git a/aicp-aosp.xml b/aicp-aosp.xml
index 427eb19..cd1170d 100644 (file)
--- a/aicp-aosp.xml
+++ b/aicp-aosp.xml
@@ -24,6 +24,7 @@
   <project path="packages/apps/Launcher3" name="AICP/packages_apps_Launcher3" groups="pdk-fs" remote="aicp" />\r
   <project path="packages/apps/Settings" name="AICP/packages_apps_Settings" groups="pdk-fs" remote="aicp" />\r
   <project path="packages/apps/Updater" name="AICP/packages_apps_Updater" groups="pdk-fs" remote="aicp" />\r
+  <project path="packages/services/Telecomm" name="AICP/packages_services_Telecomm" groups="pdk-cw-fs,pdk-fs" remote="aicp" />\r
   <project path="system/core" name="AICP/system_core" groups="pdk" remote="aicp" />\r
   <project path="system/update_engine" name="AICP/system_update_engine" groups="pdk" remote="aicp" />\r
 \r
@@ -33,6 +34,7 @@
   <project path="external/libnfc-nxp" name="LineageOS/android_external_libnfc-nxp" remote="lineage" />\r
   <project path="external/tinycompress" name="LineageOS/android_external_tinycompress" groups="pdk" remote="lineage" />\r
   <project path="external/selinux" name="LineageOS/android_external_selinux" 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/interfaces" name="LineageOS/android_hardware_interfaces" groups="pdk" remote="lineage" />\r
   <project path="hardware/libhardware" name="LineageOS/android_hardware_libhardware" groups="pdk" remote="lineage" />\r
@@ -51,7 +53,6 @@
   <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/providers/DownloadProvider" name="LineageOS/android_packages_providers_DownloadProvider" groups="pdk-cw-fs,pdk-fs" remote="lineage" />\r
-  <project path="packages/services/Telecomm" name="LineageOS/android_packages_services_Telecomm" groups="pdk-cw-fs,pdk-fs" remote="lineage" />\r
   <project path="packages/services/Telephony" name="LineageOS/android_packages_services_Telephony" groups="pdk-cw-fs,pdk-fs" 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-caf.xml b/aicp-caf.xml
index 7d4280c..4d7d601 100644 (file)
--- a/aicp-caf.xml
+++ b/aicp-caf.xml
@@ -2,9 +2,7 @@
 <manifest>\r
 \r
   <!-- CodeAurora additions -->\r
-  <project path="device/qcom/sepolicy" name="LineageOS/android_device_qcom_sepolicy" groups="qcom,pdk-qcom" remote="lineage" />\r
   <!--<project path="device/qcom/sepolicy-legacy" name="LineageOS/android_device_qcom_sepolicy-legacy" groups="qcom,pdk-qcom" remote="lineage" />-->\r
-  <project path="device/qcom/sepolicy-legacy-um" name="LineageOS/android_device_qcom_sepolicy" groups="qcom,pdk-qcom" revision="lineage-17.0-legacy-um" remote="lineage" />\r
   <project path="external/ant-wireless/ant_native" name="LineageOS/android_external_ant-wireless_ant_native" remote="lineage" />\r
   <project path="external/ant-wireless/ant_service" name="LineageOS/android_external_ant-wireless_ant_service" remote="lineage" />\r
   <project path="external/ant-wireless/antradio-library" name="LineageOS/android_external_ant-wireless_antradio-library" remote="lineage" />\r
@@ -23,7 +21,7 @@
     <!-- <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/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
@@ -46,9 +44,9 @@
   <!-- <project path="hardware/qcom-caf/msm8952/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" revision="lineage-17.0-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.0-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.0-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.0-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.0-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.0-caf-msm8960" 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.0-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.0-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.0-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.0-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.0-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.0-caf-msm8974" remote="lineage" />\r

diff --git a/aicp-default.xml b/aicp-default.xml
index 8a1777c..b52fd9f 100644 (file)
--- a/aicp-default.xml
+++ b/aicp-default.xml
@@ -34,6 +34,9 @@
   <include name="aicp-caf.xml" />\r
 \r
   <!-- AICP additions -->\r
+  <project path="device/aicp/sepolicy" name="AICP/device_aicp_sepolicy" remote="aicp" />\r
+  <project path="device/qcom/sepolicy" name="AICP/device_qcom_sepolicy" groups="qcom,pdk-qcom" remote="aicp" />\r
+  <project path="device/qcom/sepolicy-legacy-um" name="AICP/device_qcom_sepolicy" groups="qcom,pdk-qcom" revision="q10.0-legacy-um" remote="aicp" />\r
   <project path="frameworks/opt/aicpgear" name="AICP/frameworks_opt_aicpgear" remote="aicp" />\r
   <project path="frameworks/opt/jamesdsp" name="AICP/frameworks_opt_jamesdsp" remote="aicp" />\r
   <project path="packages/apps/AicpExtras" name="AICP/packages_apps_AicpExtras" remote="aicp" />\r
@@ -46,7 +49,6 @@
   <project path="external/ntfs-3g" name="LineageOS/android_external_ntfs-3g" remote="lineage" />\r
   <project path="hardware/lineage/interfaces" name="LineageOS/android_hardware_lineage_interfaces" remote="lineage" />\r
   <project path="packages/apps/Jelly" name="LineageOS/android_packages_apps_Jelly" remote="lineage" />\r
-  <project path="prebuilts/openssl" name="LineageOS/android_prebuilts_openssl" clone-depth="1" remote="lineage" />\r
   <project path="prebuilts/tools-aicp" name="LineageOS/android_prebuilts_tools-lineage" clone-depth="1" remote="lineage" />\r
   <project path="system/tools/dtbtool" name="LineageOS/android_system_tools_dtbtool" remote="lineage" />\r
 \r

diff --git a/remove.xml b/remove.xml
index 4c861c9..fd5bf5f 100644 (file)
--- a/remove.xml
+++ b/remove.xml
@@ -13,6 +13,7 @@
   <remove-project name="platform/frameworks/base" />\r
   <remove-project name="platform/frameworks/native" />\r
   <remove-project name="platform/frameworks/opt/telephony" />\r
+  <remove-project name="platform/frameworks/opt/net/wifi" />\r
   <remove-project name="platform/hardware/interfaces" />\r
   <remove-project name="platform/hardware/libhardware" />\r
   <remove-project name="platform/hardware/libhardware_legacy" />\r
@@ -43,5 +44,8 @@
   <remove-project name="platform/system/bt" />\r
   <remove-project name="platform/system/core" />\r
   <remove-project name="platform/system/update_engine" />\r
+  <remove-project name="platform/packages/apps/Browser2" />\r
+\r
+\r
 \r
 </manifest>\r