Manifest for Android CTS 12.1 Release 14 (13441502)

Change-Id: Ifba3ef1af7d4e004c3801fa56527455fc035c126

default.xml

@@ -1,16 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <manifest>
-
+  <remote name="aosp" fetch=".." review="https://android-review.googlesource.com/"/>
-  <remote  name="aosp"
+  <default remote="aosp" sync-j="4" revision="refs/tags/android-cts-12.1_r14"/>
-           fetch=".."
-           review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-platform-12.0.0_r7"
-           remote="aosp"
-           sync-j="4" />
-
-  <superproject name="platform/superproject" remote="aosp" revision="android-platform-12.0.0_r7" />
   <contactinfo bugurl="go/repo-bug"/>
-
   <project path="build/make" name="platform/build" groups="pdk">
     <copyfile src="core/root.mk" dest="Makefile"/>
     <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk"/>
@@ -39,6 +31,8 @@
   <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs,pdk-fs"/>
   <project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs,pdk-fs"/>
   <project path="developers/build" name="platform/developers/build" groups="developers,pdk"/>
+  <project path="developers/demos" name="platform/developers/demos" groups="developers"/>
+  <project path="developers/samples/android" name="platform/developers/samples/android" groups="developers"/>
   <project path="development" name="platform/development" groups="developers,pdk-cw-fs,pdk-fs"/>
   <project path="device/amlogic/yukawa" name="device/amlogic/yukawa" groups="device,yukawa,pdk"/>
   <project path="device/amlogic/yukawa-kernel" name="device/amlogic/yukawa-kernel" groups="device,yukawa,pdk" clone-depth="2"/>
@@ -62,9 +56,37 @@
   <project path="device/generic/x86_64" name="device/generic/x86_64" groups="pdk"/>
   <project path="device/generic/vulkan-cereal" name="device/generic/vulkan-cereal" groups="pdk"/>
   <project path="device/google/atv" name="device/google/atv" groups="device,broadcom_pdk,generic_fs,pdk"/>
+  <project path="device/google/barbet" name="device/google/barbet" groups="device,barbet"/>
+  <project path="device/google/barbet-kernel" name="device/google/barbet-kernel" groups="device,barbet" clone-depth="1"/>
+  <project path="device/google/barbet-sepolicy" name="device/google/barbet-sepolicy" groups="device,barbet"/>
+  <project path="device/google/bonito" name="device/google/bonito" groups="device,bonito"/>
+  <project path="device/google/bonito-kernel" name="device/google/bonito-kernel" groups="device,bonito" clone-depth="1"/>
+  <project path="device/google/bonito-sepolicy" name="device/google/bonito-sepolicy" groups="device,bonito"/>
+  <project path="device/google/bramble" name="device/google/bramble" groups="device,bramble"/>
+  <project path="device/google/bramble-sepolicy" name="device/google/bramble-sepolicy" groups="device,bramble"/>
   <project path="device/google/contexthub" name="device/google/contexthub" groups="device,pdk"/>
+  <project path="device/google/coral" name="device/google/coral" groups="device,coral,generic_fs"/>
+  <project path="device/google/coral-kernel" name="device/google/coral-kernel" groups="device,coral,generic_fs" clone-depth="1"/>
+  <project path="device/google/coral-sepolicy" name="device/google/coral-sepolicy" groups="device,coral,generic_fs"/>
+  <project path="device/google/gs101" name="device/google/gs101" groups="device,slider"/>
+  <project path="device/google/gs101-sepolicy" name="device/google/gs101-sepolicy" groups="device,slider"/>
+  <project path="device/google/gs-common" name="device/google/gs-common" groups="device,slider,pdk-gs-arm"/>
+  <project path="device/google/raviole" name="device/google/raviole" groups="device,slider"/>
+  <project path="device/google/raviole-kernel" name="device/google/raviole-kernel" groups="device,slider" clone-depth="1"/>
+  <project path="device/google/redbull" name="device/google/redbull" groups="device,redbull"/>
+  <project path="device/google/redbull-kernel" name="device/google/redbull-kernel" groups="device,bramble,redfin" clone-depth="1"/>
+  <project path="device/google/redbull-sepolicy" name="device/google/redbull-sepolicy" groups="device,redbull"/>
+  <project path="device/google/redfin" name="device/google/redfin" groups="device,redfin"/>
+  <project path="device/google/redfin-sepolicy" name="device/google/redfin-sepolicy" groups="device,redfin"/>
+  <project path="device/google/sunfish" name="device/google/sunfish" groups="device,sunfish"/>
+  <project path="device/google/sunfish-kernel" name="device/google/sunfish-kernel" groups="device,sunfish" clone-depth="1"/>
+  <project path="device/google/sunfish-sepolicy" name="device/google/sunfish-sepolicy" groups="device,sunfish"/>
+  <project path="device/google/crosshatch" name="device/google/crosshatch" groups="device,crosshatch,generic_fs"/>
+  <project path="device/google/crosshatch-kernel" name="device/google/crosshatch-kernel" groups="device,crosshatch,generic_fs" clone-depth="1"/>
+  <project path="device/google/crosshatch-sepolicy" name="device/google/crosshatch-sepolicy" groups="device,crosshatch,generic_fs"/>
   <project path="device/google/cuttlefish" name="device/google/cuttlefish" groups="device,pdk"/>
   <project path="device/google/cuttlefish_prebuilts" name="device/google/cuttlefish_prebuilts" groups="device,pdk" clone-depth="1"/>
+  <project path="device/google/fuchsia" name="device/google/fuchsia" groups="device"/>
   <project path="device/google/trout" name="device/google/trout" groups="device,trout,gull,pdk"/>
   <project path="device/google/vrservices" name="device/google/vrservices" groups="pdk"/>
   <project path="device/google_car" name="device/google_car" groups="pdk"/>
@@ -74,12 +96,12 @@
   <project path="device/linaro/hikey-kernel" name="device/linaro/hikey-kernel" groups="device,hikey,pdk" clone-depth="1"/>
   <project path="device/linaro/poplar" name="device/linaro/poplar" groups="device,poplar,pdk"/>
   <project path="device/linaro/poplar-kernel" name="device/linaro/poplar-kernel" groups="device,poplar,pdk" clone-depth="1"/>
+  <project name="device/mediatek/wembley-sepolicy" path="device/mediatek/wembley-sepolicy" groups="device"/>
   <project path="device/sample" name="device/sample" groups="pdk"/>
   <project path="device/ti/beagle_x15" name="device/ti/beagle-x15" groups="device,beagle_x15,pdk"/>
   <project path="device/ti/beagle_x15-kernel" name="device/ti/beagle-x15-kernel" groups="device,beagle_x15,pdk" clone-depth="1"/>
   <project path="external/aac" name="platform/external/aac" groups="pdk"/>
   <project path="external/abseil-cpp" name="platform/external/abseil-cpp" groups="pdk"/>
-  <project path="external/adhd" name="platform/external/adhd" groups="pdk" />
   <project path="external/adt-infra" name="platform/external/adt-infra" groups="adt-infra,notdefault,pdk-fs"/>
   <project path="external/android-clat" name="platform/external/android-clat" groups="pdk"/>
   <project path="external/androidplot" name="platform/external/androidplot" groups="pdk"/>
@@ -92,10 +114,13 @@
   <project path="external/apache-harmony" name="platform/external/apache-harmony" groups="pdk"/>
   <project path="external/apache-http" name="platform/external/apache-http" groups="pdk"/>
   <project path="external/apache-xml" name="platform/external/apache-xml" groups="pdk"/>
+  <project path="external/arm-neon-tests" name="platform/external/arm-neon-tests" groups="vendor"/>
   <project path="external/arm-optimized-routines" name="platform/external/arm-optimized-routines" groups="pdk"/>
   <project path="external/arm-trusted-firmware" name="platform/external/arm-trusted-firmware" groups="pdk"/>
   <project path="external/auto" name="platform/external/auto" groups="pdk"/>
   <project path="external/autotest" name="platform/external/autotest" groups="pdk-fs"/>
+  <project path="external/android-nn-driver" name="platform/external/android-nn-driver" groups="pdk-lassen"/>
+  <project path="external/armnn" name="platform/external/armnn" groups="pdk-lassen"/>
   <project path="external/avb" name="platform/external/avb" groups="pdk"/>
   <project path="external/bazelbuild-rules_android" name="platform/external/bazelbuild-rules_android" groups="pdk"/>
   <project path="external/bc" name="platform/external/bc" groups="pdk"/>
@@ -117,6 +142,7 @@
   <project path="external/cldr" name="platform/external/cldr" groups="pdk"/>
   <project path="external/cn-cbor" name="platform/external/cn-cbor" groups="pdk"/>
   <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="pdk"/>
+  <project path="external/ComputeLibrary" name="platform/external/ComputeLibrary" groups="pdk-lassen"/>
   <project path="external/connectedappssdk" name="platform/external/connectedappssdk" groups="pdk"/>
   <project path="external/conscrypt" name="platform/external/conscrypt" groups="pdk"/>
   <project path="external/cpu_features" name="platform/external/cpu_features" groups="pdk"/>
@@ -339,6 +365,7 @@
   <project path="external/okio" name="platform/external/okio" groups="pdk"/>
   <project path="external/one-true-awk" name="platform/external/one-true-awk" groups="pdk"/>
   <project path="external/opencensus-java" name="platform/external/opencensus-java" groups="pdk,tradefed"/>
+  <project path="external/OpenCL-CTS" name="platform/external/OpenCL-CTS"/>
   <project path="external/OpenCSD" name="platform/external/OpenCSD" groups="pdk"/>
   <project path="external/openscreen" name="platform/external/openscreen" groups="pdk"/>
   <project path="external/openssh" name="platform/external/openssh" groups="pdk"/>
@@ -446,6 +473,7 @@
   <project path="external/rust/crates/futures-task" name="platform/external/rust/crates/futures-task" groups="pdk"/>
   <project path="external/rust/crates/futures-util" name="platform/external/rust/crates/futures-util" groups="pdk"/>
   <project path="external/rust/crates/gdbstub" name="platform/external/rust/crates/gdbstub" groups="pdk"/>
+  <project path="external/rust/crates/gdbstub_arch" name="platform/external/rust/crates/gdbstub_arch" groups="pdk"/>
   <project path="external/rust/crates/getrandom" name="platform/external/rust/crates/getrandom" groups="pdk"/>
   <project path="external/rust/crates/glob" name="platform/external/rust/crates/glob" groups="pdk"/>
   <project path="external/rust/crates/grpcio" name="platform/external/rust/crates/grpcio" groups="pdk"/>
@@ -598,6 +626,7 @@
   <project path="external/tagsoup" name="platform/external/tagsoup" groups="pdk"/>
   <project path="external/tcpdump" name="platform/external/tcpdump" groups="pdk"/>
   <project path="external/tensorflow" name="platform/external/tensorflow" groups="pdk"/>
+  <project path="external/TestParameterInjector" name="platform/external/TestParameterInjector" groups="pdk"/>
   <project path="external/testng" name="platform/external/testng" groups="pdk"/>
   <project path="external/tflite-support" name="platform/external/tflite-support" groups="pdk"/>
   <project path="external/timezone-boundary-builder" name="platform/external/timezone-boundary-builder" groups="pdk" clone-depth="2"/>
@@ -605,18 +634,19 @@
   <project path="external/tinyalsa_new" name="platform/external/tinyalsa_new" groups="pdk"/>
   <project path="external/tinycompress" name="platform/external/tinycompress" groups="pdk"/>
   <project path="external/tinyxml2" name="platform/external/tinyxml2" groups="pdk"/>
+  <project path="external/toolchain-utils" name="platform/external/toolchain-utils"/>
   <project path="external/toybox" name="platform/external/toybox" groups="pdk"/>
   <project path="external/tpm2-tss" name="platform/external/tpm2-tss" groups="pdk"/>
   <project path="external/tremolo" name="platform/external/tremolo" groups="pdk"/>
   <project path="external/turbine" name="platform/external/turbine" groups="pdk"/>
   <project path="external/unicode" name="platform/external/unicode" groups="pdk"/>
+  <project path="external/universal-tween-engine" name="platform/external/universal-tween-engine"/>
   <project path="external/ukey2" name="platform/external/ukey2" groups="pdk"/>
   <project path="external/usrsctp" name="platform/external/usrsctp" groups="pdk"/>
   <project path="external/v4l2_codec2" name="platform/external/v4l2_codec2" groups="pdk"/>
   <project path="external/vboot_reference" name="platform/external/vboot_reference" groups="vboot,pdk-fs"/>
   <project path="external/virglrenderer" name="platform/external/virglrenderer" groups="pdk"/>
   <project path="external/vixl" name="platform/external/vixl" groups="pdk"/>
-  <project path="external/vm_tools/p9" name="platform/external/vm_tools/p9" groups="pdk" />
   <project path="external/vogar" name="platform/external/vogar" groups="pdk"/>
   <project path="external/volley" name="platform/external/volley" groups="pdk"/>
   <project path="external/vulkan-headers" name="platform/external/vulkan-headers" groups="pdk"/>
@@ -659,6 +689,7 @@
   <project path="frameworks/opt/car/setupwizard" name="platform/frameworks/opt/car/setupwizard" groups="pdk"/>
   <project path="frameworks/opt/chips" name="platform/frameworks/opt/chips" groups="pdk-cw-fs,pdk-fs"/>
   <project path="frameworks/opt/colorpicker" name="platform/frameworks/opt/colorpicker" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="frameworks/opt/localepicker" name="platform/frameworks/opt/localepicker"/>
   <project path="frameworks/opt/net/ethernet" name="platform/frameworks/opt/net/ethernet" groups="pdk-fs"/>
   <project path="frameworks/opt/net/ims" name="platform/frameworks/opt/net/ims" groups="frameworks_ims,pdk-cw-fs,pdk-fs"/>
   <project path="frameworks/opt/net/voip" name="platform/frameworks/opt/net/voip" groups="pdk-cw-fs,pdk-fs"/>
@@ -678,6 +709,9 @@
   <project path="hardware/google/av" name="platform/hardware/google/av" groups="pdk"/>
   <project path="hardware/google/camera" name="platform/hardware/google/camera" groups="pdk"/>
   <project path="hardware/google/easel" name="platform/hardware/google/easel" groups="pdk,easel"/>
+  <project path="hardware/google/gchips" name="platform/hardware/google/gchips" groups="pdk-lassen"/>
+  <project path="hardware/google/graphics/common" name="platform/hardware/google/graphics/common" groups="pdk-lassen"/>
+  <project path="hardware/google/graphics/gs101" name="platform/hardware/google/graphics/gs101" groups="pdk-lassen"/>
   <project path="hardware/google/interfaces" name="platform/hardware/google/interfaces" groups="pdk"/>
   <project path="hardware/google/pixel" name="platform/hardware/google/pixel" groups="generic_fs,pixel"/>
   <project path="hardware/google/pixel-sepolicy" name="platform/hardware/google/pixel-sepolicy" groups="generic_fs,pixel"/>
@@ -700,6 +734,7 @@
   <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom_msm8960,pdk-qcom"/>
   <project path="hardware/qcom/msm8994" name="platform/hardware/qcom/msm8994" groups="qcom_msm8994,pdk-qcom"/>
   <project path="hardware/qcom/msm8996" name="platform/hardware/qcom/msm8996" groups="qcom_msm8996,pdk-qcom"/>
+  <project path="hardware/qcom/msm8x09" name="platform/hardware/qcom/msm8x09" groups="qcom_msm8x09"/>
   <project path="hardware/qcom/msm8x26" name="platform/hardware/qcom/msm8x26" groups="qcom_msm8x26,pdk-qcom"/>
   <project path="hardware/qcom/msm8x27" name="platform/hardware/qcom/msm8x27" groups="qcom_msm8x27,pdk-qcom"/>
   <project path="hardware/qcom/msm8x84" name="platform/hardware/qcom/msm8x84" groups="qcom_msm8x84,pdk-qcom"/>
@@ -714,12 +749,35 @@
   <project path="hardware/qcom/sdm845/media" name="platform/hardware/qcom/sdm845/media" groups="generic_fs,qcom_sdm845"/>
   <project path="hardware/qcom/sdm845/thermal" name="platform/hardware/qcom/sdm845/thermal" groups="generic_fs,qcom_sdm845"/>
   <project path="hardware/qcom/sdm845/vr" name="platform/hardware/qcom/sdm845/vr" groups="generic_fs,qcom_sdm845"/>
+  <project path="hardware/qcom/sm7150/gps" name="platform/hardware/qcom/sm7150/gps" groups="qcom_sm7150">
+    <linkfile src="os_pickup.mk" dest="hardware/qcom/sm7150/Android.mk"/>
+    <linkfile src="os_pickup.bp" dest="hardware/qcom/sm7150/Android.bp"/>
+  </project>
+  <project path="hardware/qcom/sm7250/display" name="platform/hardware/qcom/sm7250/display" groups="qcom_sm7250"/>
+  <project path="hardware/qcom/sm7250/gps" name="platform/hardware/qcom/sm7250/gps" groups="qcom_sm7250">
+    <linkfile src="os_pickup.mk" dest="hardware/qcom/sm7250/Android.mk"/>
+    <linkfile src="os_pickup.bp" dest="hardware/qcom/sm7250/Android.bp"/>
+  </project>
+  <project path="hardware/qcom/sm7250/media" name="platform/hardware/qcom/sm7250/media" groups="qcom_sm7250"/>
+  <project path="hardware/qcom/sm8150/data/ipacfg-mgr" name="platform/hardware/qcom/sm8150/data/ipacfg-mgr" groups="qcom_sm8150">
+    <linkfile src="os_pickup.mk" dest="hardware/qcom/sm8150/Android.mk"/>
+    <linkfile src="os_pickup.bp" dest="hardware/qcom/sm8150/Android.bp"/>
+  </project>
+  <project path="hardware/qcom/sm8150/display" name="platform/hardware/qcom/sm8150/display" groups="qcom_sm8150"/>
+  <project path="hardware/qcom/sm8150/gps" name="platform/hardware/qcom/sm8150/gps" groups="qcom_sm8150"/>
+  <project path="hardware/qcom/sm8150/media" name="platform/hardware/qcom/sm8150/media" groups="qcom_sm8150"/>
+  <project path="hardware/qcom/sm8150/thermal" name="platform/hardware/qcom/sm8150/thermal" groups="qcom_sm8150"/>
+  <project path="hardware/qcom/sm8150/vr" name="platform/hardware/qcom/sm8150/vr" groups="qcom_sm8150"/>
+  <project path="hardware/qcom/sm8150p/gps" name="platform/hardware/qcom/sm8150p/gps" groups="qcom_sm8150p">
+    <linkfile src="os_pickup.mk" dest="hardware/qcom/sm8150p/Android.mk"/>
+    <linkfile src="os_pickup.bp" dest="hardware/qcom/sm8150p/Android.bp"/>
+  </project>
   <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan,pdk-qcom"/>
   <project path="hardware/ril" name="platform/hardware/ril" groups="pdk"/>
+  <project path="hardware/samsung/nfc" name="platform/hardware/samsung/nfc" groups="pdk"/>
   <project path="hardware/st/nfc" name="platform/hardware/st/nfc" groups="pdk"/>
   <project path="hardware/st/secure_element" name="platform/hardware/st/secure_element" groups="pdk"/>
   <project path="hardware/st/secure_element2" name="platform/hardware/st/secure_element2" groups="pdk"/>
-  <project path="hardware/samsung/nfc" name="platform/hardware/samsung/nfc" groups="pdk" />
   <project path="hardware/ti/am57x" name="platform/hardware/ti/am57x" groups="pdk"/>
   <project path="kernel/configs" name="kernel/configs" groups="vts,pdk"/>
   <project path="kernel/prebuilts/4.19/arm64" name="kernel/prebuilts/4.19/arm64" groups="pdk" clone-depth="1"/>
@@ -810,6 +868,7 @@
   <project path="packages/apps/Traceur" name="platform/packages/apps/Traceur" groups="pdk-fs"/>
   <project path="packages/apps/TvSettings" name="platform/packages/apps/TvSettings" groups="pdk-fs"/>
   <project path="packages/apps/TV" name="platform/packages/apps/TV" groups="pdk"/>
+  <project path="packages/apps/UniversalMediaPlayer" name="platform/packages/apps/UniversalMediaPlayer"/>
   <project path="packages/apps/WallpaperPicker" name="platform/packages/apps/WallpaperPicker" groups="pdk-fs"/>
   <project path="packages/apps/WallpaperPicker2" name="platform/packages/apps/WallpaperPicker2" groups="pdk-fs"/>
   <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" groups="pdk-fs"/>
@@ -837,6 +896,7 @@
   <project path="packages/modules/Scheduling" name="platform/packages/modules/Scheduling" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/modules/SdkExtensions" name="platform/packages/modules/SdkExtensions" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/modules/StatsD" name="platform/packages/modules/StatsD" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/modules/TestModule" name="platform/packages/modules/TestModule"/>
   <project path="packages/modules/Virtualization" name="platform/packages/modules/Virtualization" groups="pdk"/>
   <project path="packages/modules/vndk" name="platform/packages/modules/vndk" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/modules/Wifi" name="platform/packages/modules/Wifi" groups="pdk-cw-fs,pdk-fs"/>
@@ -928,6 +988,7 @@
   <project path="prebuilts/vndk/v28" name="platform/prebuilts/vndk/v28" groups="pdk" clone-depth="1"/>
   <project path="prebuilts/vndk/v29" name="platform/prebuilts/vndk/v29" groups="pdk" clone-depth="1"/>
   <project path="prebuilts/vndk/v30" name="platform/prebuilts/vndk/v30" groups="pdk" clone-depth="1"/>
+  <project path="prebuilts/vndk/v31" name="platform/prebuilts/vndk/v31" groups="pdk" clone-depth="1"/>
   <project path="sdk" name="platform/sdk" groups="pdk-cw-fs,pdk-fs"/>
   <project path="system/apex" name="platform/system/apex" groups="pdk"/>
   <project path="system/bt" name="platform/system/bt" groups="pdk"/>
@@ -984,6 +1045,9 @@
   <project path="test/framework" name="platform/test/framework" groups="vts,projectarch,pdk"/>
   <project path="test/mlts/benchmark" name="platform/test/mlts/benchmark" groups="pdk"/>
   <project path="test/mlts/models" name="platform/test/mlts/models" groups="pdk"/>
+  <project path="test/app_compat/csuite" name="platform/test/app_compat/csuite"/>
+  <project path="test/cts-root" name="platform/test/cts-root"/>
+  <project path="test/mts" name="platform/test/mts"/>
   <project path="test/vti/dashboard" name="platform/test/vti/dashboard" groups="vts,projectarch,pdk"/>
   <project path="test/vti/fuzz_test_serving" name="platform/test/vti/fuzz_test_serving" groups="vts,projectarch,pdk"/>
   <project path="test/vti/test_serving" name="platform/test/vti/test_serving" groups="vts,projectarch,pdk"/>
@@ -996,26 +1060,39 @@
   <project path="test/vts-testcase/performance" name="platform/test/vts-testcase/performance" groups="vts,projectarch,pdk"/>
   <project path="test/vts-testcase/security" name="platform/test/vts-testcase/security" groups="vts,projectarch,pdk"/>
   <project path="test/vts-testcase/vndk" name="platform/test/vts-testcase/vndk" groups="vts,pdk"/>
+  <project path="test/catbox" name="platform/test/catbox"/>
+  <project path="toolchain/benchmark" name="toolchain/benchmark"/>
   <project path="toolchain/pgo-profiles" name="toolchain/pgo-profiles" groups="pdk"/>
   <project path="tools/aadevtools" name="platform/tools/aadevtools" groups="pdk"/>
   <project path="tools/acloud" name="platform/tools/acloud" groups="tools,vts,projectarch,pdk,tradefed"/>
+  <project path="tools/adt/idea" name="platform/tools/adt/idea" groups="notdefault,tools"/>
   <project path="tools/apifinder" name="platform/tools/apifinder" groups="pdk,tools"/>
   <project path="tools/apksig" name="platform/tools/apksig" groups="pdk,tradefed"/>
   <project path="tools/apkzlib" name="platform/tools/apkzlib" groups="pdk,tradefed"/>
   <project path="tools/asuite" name="platform/tools/asuite" groups="pdk"/>
+  <project path="tools/base" name="platform/tools/base" groups="notdefault,tools"/>
+  <project path="tools/build" name="platform/tools/build" groups="notdefault,tools"/>
+  <project path="tools/carrier_settings" name="platform/tools/carrier_settings" groups="tools"/>
   <project path="tools/currysrc" name="platform/tools/currysrc" groups="pdk"/>
+  <project path="tools/deviceinfra/prebuilts" name="platform/tools/deviceinfra/prebuilts" groups="pdk,tools"/>
   <project path="tools/dexter" name="platform/tools/dexter" groups="tools,pdk-fs"/>
   <project path="tools/doc_generation" name="platform/tools/doc_generation" groups="tools,pdk"/>
+  <project path="tools/external_updater" name="platform/tools/external_updater" groups="tools"/>
+  <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" groups="tools"/>
+  <project path="tools/idea" name="platform/tools/idea" groups="notdefault,tools"/>
   <project path="tools/metalava" name="platform/tools/metalava" groups="pdk,tools"/>
+  <project path="tools/motodev" name="platform/tools/motodev" groups="notdefault,motodev"/>
   <project path="tools/platform-compat" name="tools/platform-compat" groups="pdk-cw-fs,pdk-fs,pdk"/>
   <project path="tools/ndkports" name="platform/tools/ndkports" groups="pdk"/>
   <project path="tools/repohooks" name="platform/tools/repohooks" groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed"/>
   <project path="tools/security" name="platform/tools/security" groups="pdk,tools"/>
+  <project path="tools/studio/cloud" name="platform/tools/studio/cloud" groups="notdefault,tools"/>
+  <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools"/>
   <project path="tools/test/connectivity" name="platform/tools/test/connectivity" groups="pdk"/>
   <project path="tools/test/graphicsbenchmark" name="platform/tools/test/graphicsbenchmark" groups="pdk"/>
+  <project path="tools/test/openhst" name="platform/tools/test/openhst" groups="tools"/>
   <project path="tools/tradefederation/prebuilts" name="platform/tools/tradefederation/prebuilts" groups="pdk,tradefed"/>
   <project path="tools/treble" name="platform/tools/treble" groups="tools,pdk"/>
   <project path="tools/trebuchet" name="platform/tools/trebuchet" groups="tools,cts,pdk,pdk-cw-fs,pdk-fs"/>
-
   <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload"/>
 </manifest>