manifest: Track multiple repos from LoS

Squahed commit of:
1. manifest: Reenable cmdline tools (https://review.lineageos.org/c/LineageOS/android/+/260650)
2. manifest: switch to our fork of system/netd (https://review.lineageos.org/c/LineageOS/android/+/261820)
3. manifest: Switch to our broadcom libbt fork & enable nfc (https://review.lineageos.org/c/LineageOS/android/+/261942)

Change-Id: I3d1b685fef32d29c742fcebdc9a5005ec1dabde5

diff --git a/aicp-aosp.xml b/aicp-aosp.xml
index e76c30e..08dd068 100644 (file)
--- a/aicp-aosp.xml
+++ b/aicp-aosp.xml
@@ -33,10 +33,12 @@
   <project path="art" name="LineageOS/android_art" groups="pdk" remote="lineage" />\r
   <project path="device/generic/goldfish" name="LineageOS/android_device_generic_goldfish" groups="pdk" remote="lineage" />\r
   <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="external/tinycompress" name="LineageOS/android_external_tinycompress" 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/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
   <project path="hardware/libhardware_legacy" name="LineageOS/android_hardware_libhardware_legacy" groups="pdk" remote="lineage" />\r
@@ -61,5 +63,6 @@
   <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/bt" name="LineageOS/android_system_bt" groups="pdk" remote="lineage" />\r
+  <project path="system/netd" name="LineageOS/android_system_netd" groups="pdk" remote="lineage" />\r
 \r
 </manifest>\r

diff --git a/aicp-default.xml b/aicp-default.xml
index 90648a9..689bfc4 100644 (file)
--- a/aicp-default.xml
+++ b/aicp-default.xml
@@ -47,8 +47,19 @@
   <project path="vendor/aicp" name="AICP/vendor_aicp" remote="aicp" />\r
 \r
   <!-- Lineage additions -->\r
+  <project path="external/bash" name="LineageOS/android_external_bash" remote="lineage" />\r
   <project path="external/exfat" name="LineageOS/android_external_exfat" remote="lineage" />\r
+  <project path="external/htop" name="LineageOS/android_external_htop" remote="lineage" />\r
+  <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="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
+  <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
   <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/tools-aicp" name="LineageOS/android_prebuilts_tools-lineage" clone-depth="1" remote="lineage" />\r

diff --git a/remove.xml b/remove.xml
index e64bc68..32f77a1 100644 (file)
--- a/remove.xml
+++ b/remove.xml
@@ -7,6 +7,7 @@
   <remove-project name="platform/bootable/recovery" />\r
   <remove-project name="platform/build" />\r
   <remove-project name="platform/build/soong" />\r
+  <remove-project name="platform/external/openssh" />\r
   <remove-project name="platform/external/selinux" />\r
   <remove-project name="platform/external/tinycompress" />\r
   <remove-project name="platform/frameworks/av" />\r
@@ -15,6 +16,7 @@
   <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/broadcom/libbt" />\r
   <remove-project name="platform/hardware/libhardware" />\r
   <remove-project name="platform/hardware/libhardware_legacy" />\r
   <remove-project name="platform/hardware/nxp/nfc" />\r
@@ -45,6 +47,7 @@
   <remove-project name="platform/prebuilts/r8" />\r
   <remove-project name="platform/system/bt" />\r
   <remove-project name="platform/system/core" />\r
+  <remove-project name="platform/system/netd" />\r
   <remove-project name="platform/system/update_engine" />\r
   <remove-project name="platform/packages/apps/Browser2" />\r
 \r