Manifest for Android CTS 11.0 Release 12 (10119570)

Change-Id: I6c861ced95fdad107250b473d42e9060e5322179
Pin manifest of sparse-9883162-L55200000960621909(release-request-8788f903-10bd-4a79-97f1-54d17eec8e81-for-aosp-android11-tests-release-9883162)
2025-11-20 01:20:46 +08:00 · 2023-05-15 14:45:57 -07:00 · 2023-05-12 01:26:34 +00:00 · 2023-04-04 20:24:20 +00:00 · 2023-03-21 20:23:18 +00:00 · 2023-03-17 20:22:34 +00:00
1 changed files with 816 additions and 892 deletions
--- a/default.xml
+++ b/default.xml
@@ -1,13 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <manifest>
-
-  <remote  name="aosp"
-           fetch=".."
-           review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-mainline-12.0.0_r38"
-           remote="aosp"
-           sync-j="4" />
-
+  <remote name="aosp" fetch=".." review="https://android-review.googlesource.com/"/>
+  <default remote="aosp" sync-j="4" revision="refs/tags/android-cts-11.0_r12"/>
+  <superproject name="platform/superproject" remote="aosp" revision="android-cts-11.0_r12"/>
+  <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"/>
@@ -17,13 +13,7 @@
    <linkfile src="target" dest="build/target"/>
    <linkfile src="tools" dest="build/tools"/>
  </project>
-  <project path="build/bazel" name="platform/build/bazel" groups="pdk" >
-    <linkfile src="bazel.WORKSPACE" dest="WORKSPACE" />
-    <linkfile src="bazel.sh" dest="tools/bazel" />
-    <linkfile src="bazel.BUILD" dest="BUILD" />
-  </project>
  <project path="build/blueprint" name="platform/build/blueprint" groups="pdk,tradefed"/>
-  <project path="build/pesto" name="platform/build/pesto" groups="pdk" />
  <project path="build/soong" name="platform/build/soong" groups="pdk,tradefed">
    <linkfile src="root.bp" dest="Android.bp"/>
    <linkfile src="bootstrap.bash" dest="bootstrap.bash"/>
@@ -31,19 +21,73 @@
  <project path="art" name="platform/art" groups="pdk"/>
  <project path="bionic" name="platform/bionic" groups="pdk"/>
  <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk"/>
-  <project path="bootable/libbootloader" name="platform/bootable/libbootloader" groups="vts,pdk" />
  <project path="compatibility/cdd" name="platform/compatibility/cdd" groups="pdk"/>
  <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"/>
+  <project path="device/common" name="device/common" groups="pdk-cw-fs,pdk"/>
+  <project path="device/generic/arm64" name="device/generic/arm64" groups="pdk"/>
+  <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk"/>
+  <project path="device/generic/art" name="device/generic/art" groups="pdk"/>
+  <project path="device/generic/car" name="device/generic/car" groups="pdk"/>
+  <project path="device/generic/common" name="device/generic/common" groups="pdk"/>
  <project path="device/generic/goldfish" name="device/generic/goldfish" groups="pdk"/>
  <project path="device/generic/goldfish-opengl" name="device/generic/goldfish-opengl" groups="pdk"/>
-  <project path="device/generic/vulkan-cereal" name="device/generic/vulkan-cereal" groups="pdk" />
+  <project path="device/generic/mini-emulator-arm64" name="device/generic/mini-emulator-arm64" groups="pdk"/>
+  <project path="device/generic/mini-emulator-armv7-a-neon" name="device/generic/mini-emulator-armv7-a-neon" groups="pdk"/>
+  <project path="device/generic/mini-emulator-x86" name="device/generic/mini-emulator-x86" groups="pdk"/>
+  <project path="device/generic/mini-emulator-x86_64" name="device/generic/mini-emulator-x86_64" groups="pdk"/>
+  <project path="device/generic/opengl-transport" name="device/generic/opengl-transport" groups="pdk"/>
+  <project path="device/generic/qemu" name="device/generic/qemu" groups="pdk"/>
+  <project path="device/generic/trusty" name="device/generic/trusty" groups="pdk"/>
+  <project path="device/generic/uml" name="device/generic/uml" groups="device,pdk"/>
+  <project path="device/generic/x86" name="device/generic/x86" groups="pdk"/>
+  <project path="device/generic/x86_64" name="device/generic/x86_64" groups="pdk"/>
+  <project path="device/google/atv" name="device/google/atv" groups="device,broadcom_pdk,generic_fs,pdk"/>
+  <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/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/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/cuttlefish_kernel" name="device/google/cuttlefish_kernel" groups="device,pdk" clone-depth="1"/>
+  <project path="device/google/cuttlefish_vmm" name="device/google/cuttlefish_vmm" groups="device,pdk" clone-depth="1"/>
+  <project path="device/google/fuchsia" name="device/google/fuchsia" groups="device"/>
+  <project path="device/google/muskie" name="device/google/muskie" groups="device,generic_fs,muskie"/>
+  <project path="device/google/taimen" name="device/google/taimen" groups="device,taimen"/>
+  <project path="device/google/trout" name="device/google/trout" groups="device,trout,gull"/>
+  <project path="device/google/vrservices" name="device/google/vrservices" groups="pdk"/>
+  <project path="device/google/wahoo" name="device/google/wahoo" groups="device,generic_fs,wahoo"/>
+  <project path="device/google/wahoo-kernel" name="device/google/wahoo-kernel" groups="device,generic_fs,wahoo" clone-depth="1"/>
+  <project path="device/google_car" name="device/google_car" groups="pdk"/>
+  <project path="device/linaro/bootloader/arm-trusted-firmware" name="device/linaro/bootloader/arm-trusted-firmware"/>
+  <project path="device/linaro/bootloader/edk2" name="device/linaro/bootloader/edk2"/>
+  <project path="device/linaro/bootloader/OpenPlatformPkg" name="device/linaro/bootloader/OpenPlatformPkg"/>
+  <project path="device/linaro/dragonboard" name="device/linaro/dragonboard" groups="device,dragonboard,pdk"/>
+  <project path="device/linaro/dragonboard-kernel" name="device/linaro/dragonboard-kernel" groups="device,dragonboard,pdk" clone-depth="1"/>
+  <project path="device/linaro/hikey" name="device/linaro/hikey" groups="device,hikey,pdk"/>
+  <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/adeb" name="platform/external/adeb" 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"/>
@@ -60,12 +104,8 @@
  <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"/>
  <project path="external/bcc" name="platform/external/bcc" groups="pdk"/>
  <project path="external/blktrace" name="platform/external/blktrace" groups="pdk"/>
@@ -79,14 +119,13 @@
  <project path="external/catch2" name="platform/external/catch2" groups="pdk"/>
  <project path="external/cblas" name="platform/external/cblas" groups="pdk"/>
  <project path="external/cbor-java" name="platform/external/cbor-java" groups="pdk"/>
+  <project path="external/chromium-libpac" name="platform/external/chromium-libpac" groups="pdk"/>
  <project path="external/chromium-trace" name="platform/external/chromium-trace" groups="pdk"/>
  <project path="external/chromium-webview" name="platform/external/chromium-webview" groups="pdk" clone-depth="1"/>
  <project path="external/clang" name="platform/external/clang" groups="pdk"/>
  <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"/>
  <project path="external/cpuinfo" name="platform/external/cpuinfo" groups="pdk"/>
@@ -107,7 +146,6 @@
  <project path="external/dnsmasq" name="platform/external/dnsmasq" groups="pdk"/>
  <project path="external/doclava" name="platform/external/doclava" groups="pdk"/>
  <project path="external/dokka" name="platform/external/dokka" groups="pdk"/>
-  <project path="external/downloader" name="platform/external/downloader" groups="pdk" />
  <project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer,pdk-fs"/>
  <project path="external/drrickorang" name="platform/external/drrickorang" groups="pdk"/>
  <project path="external/dtc" name="platform/external/dtc" groups="pdk"/>
@@ -117,9 +155,7 @@
  <project path="external/eigen" name="platform/external/eigen" groups="pdk"/>
  <project path="external/elfutils" name="platform/external/elfutils" groups="pdk"/>
  <project path="external/emma" name="platform/external/emma" groups="pdk"/>
-  <project path="external/erofs-utils" name="platform/external/erofs-utils" groups="pdk" />
  <project path="external/error_prone" name="platform/external/error_prone" groups="pdk"/>
-  <project path="external/escapevelocity" name="platform/external/escapevelocity" groups="pdk" />
  <project path="external/ethtool" name="platform/external/ethtool" groups="pdk"/>
  <project path="external/exoplayer" name="platform/external/exoplayer" groups="pdk"/>
  <project path="external/expat" name="platform/external/expat" groups="pdk"/>
@@ -127,8 +163,6 @@
  <project path="external/fastrpc" name="platform/external/fastrpc" groups="pdk"/>
  <project path="external/fdlibm" name="platform/external/fdlibm" groups="pdk"/>
  <project path="external/fec" name="platform/external/fec" groups="pdk"/>
-  <project path="external/fft2d" name="platform/external/fft2d" groups="pdk" />
-  <project path="external/firebase-messaging" name="platform/external/firebase-messaging" groups="pdk"/>
  <project path="external/flac" name="platform/external/flac" groups="pdk"/>
  <project path="external/flatbuffers" name="platform/external/flatbuffers" groups="pdk"/>
  <project path="external/fonttools" name="platform/external/fonttools" groups="pdk"/>
@@ -139,8 +173,6 @@
  <project path="external/FP16" name="platform/external/FP16" groups="pdk"/>
  <project path="external/FXdiv" name="platform/external/FXdiv" groups="pdk"/>
  <project path="external/gemmlowp" name="platform/external/gemmlowp" groups="pdk"/>
-  <project path="external/geojson-jackson" name="platform/external/geojson-jackson" groups="pdk" />
-  <project path="external/geonames" name="platform/external/geonames" groups="pdk" />
  <project path="external/gflags" name="platform/external/gflags" groups="pdk"/>
  <project path="external/giflib" name="platform/external/giflib" groups="pdk,qcom_msm8x26"/>
  <project path="external/glide" name="platform/external/glide" groups="pdk"/>
@@ -163,7 +195,6 @@
  <project path="external/google-fonts/rubik" name="platform/external/google-fonts/rubik" groups="pdk"/>
  <project path="external/google-fonts/zilla-slab" name="platform/external/google-fonts/zilla-slab" groups="pdk"/>
  <project path="external/google-fruit" name="platform/external/google-fruit" groups="pdk"/>
-  <project path="external/google-java-format" name="platform/external/google-java-format" groups="pdk" />
  <project path="external/google-styleguide" name="platform/external/google-styleguide" groups="pdk"/>
  <project path="external/googletest" name="platform/external/googletest" groups="pdk"/>
  <project path="external/gptfdisk" name="platform/external/gptfdisk" groups="pdk"/>
@@ -174,8 +205,8 @@
  <project path="external/gwp_asan" name="platform/external/gwp_asan" groups="pdk"/>
  <project path="external/hamcrest" name="platform/external/hamcrest" groups="pdk"/>
  <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" groups="pdk,qcom_msm8x26"/>
+  <project path="external/honggfuzz" name="platform/external/honggfuzz" groups="pdk"/>
  <project path="external/hyphenation-patterns" name="platform/external/hyphenation-patterns" groups="pdk"/>
-  <project path="external/icing" name="platform/external/icing" groups="pdk" />
  <project path="external/icu" name="platform/external/icu" groups="pdk"/>
  <project path="external/igt-gpu-tools" name="platform/external/igt-gpu-tools" groups="pdk"/>
  <project path="external/ImageMagick" name="platform/external/ImageMagick" groups="pdk"/>
@@ -188,18 +219,14 @@
  <project path="external/iputils" name="platform/external/iputils" groups="pdk"/>
  <project path="external/iw" name="platform/external/iw" groups="pdk"/>
  <project path="external/jacoco" name="platform/external/jacoco" groups="pdk"/>
-  <project path="external/jackson-annotations" name="platform/external/jackson-annotations" groups="pdk" />
-  <project path="external/jackson-core" name="platform/external/jackson-core" groups="pdk" />
-  <project path="external/jackson-databind" name="platform/external/jackson-databind" groups="pdk" />
  <project path="external/jarjar" name="platform/external/jarjar" groups="pdk"/>
  <project path="external/javaparser" name="platform/external/javaparser" groups="pdk"/>
  <project path="external/javapoet" name="platform/external/javapoet" groups="pdk"/>
  <project path="external/javasqlite" name="platform/external/javasqlite" groups="pdk"/>
-  <project path="external/javassist" name="platform/external/javassist" groups="pdk" />
  <project path="external/jcommander" name="platform/external/jcommander" groups="pdk"/>
  <project path="external/jdiff" name="platform/external/jdiff" groups="pdk"/>
+  <project path="external/jemalloc" name="platform/external/jemalloc" groups="pdk"/>
  <project path="external/jemalloc_new" name="platform/external/jemalloc_new" groups="pdk"/>
-  <project path="external/jimfs" name="platform/external/jimfs" groups="pdk" />
  <project path="external/jline" name="platform/external/jline" groups="pdk,tradefed,pdk-fs"/>
  <project path="external/jsilver" name="platform/external/jsilver" groups="pdk"/>
  <project path="external/jsmn" name="platform/external/jsmn" groups="pdk"/>
@@ -211,11 +238,8 @@
  <project path="external/kernel-headers" name="platform/external/kernel-headers" groups="pdk"/>
  <project path="external/kmod" name="platform/external/kmod" groups="pdk"/>
  <project path="external/kotlinc" name="platform/external/kotlinc" groups="pdk"/>
-  <project path="external/kotlinx.atomicfu" name="platform/external/kotlinx.atomicfu" groups="pdk" />
  <project path="external/kotlinx.coroutines" name="platform/external/kotlinx.coroutines" groups="pdk"/>
-  <project path="external/kotlinx.metadata" name="platform/external/kotlinx.metadata" groups="pdk" />
  <project path="external/ksoap2" name="platform/external/ksoap2" groups="pdk"/>
-  <project path="external/libabigail" name="platform/external/libabigail" groups="pdk" />
  <project path="external/libaom" name="platform/external/libaom" groups="pdk"/>
  <project path="external/libavc" name="platform/external/libavc" groups="pdk"/>
  <project path="external/libbackup" name="platform/external/libbackup" groups="pdk"/>
@@ -223,11 +247,10 @@
  <project path="external/libcap" name="platform/external/libcap" groups="pdk"/>
  <project path="external/libcap-ng" name="platform/external/libcap-ng" groups="pdk"/>
  <project path="external/libchrome" name="platform/external/libchrome" groups="pdk"/>
-  <project path="external/libchromeos-rs" name="platform/external/libchromeos-rs" groups="pdk" />
-  <project path="external/libcppbor" name="platform/external/libcppbor" groups="pdk" />
  <project path="external/libcups" name="platform/external/libcups" groups="pdk-cw-fs,pdk-fs"/>
  <project path="external/libcxx" name="platform/external/libcxx" groups="pdk"/>
  <project path="external/libcxxabi" name="platform/external/libcxxabi" groups="pdk"/>
+  <project path="external/libdaemon" name="platform/external/libdaemon" groups="pdk"/>
  <project path="external/libdivsufsort" name="platform/external/libdivsufsort" groups="pdk"/>
  <project path="external/libdrm" name="platform/external/libdrm" groups="pdk"/>
  <project path="external/libepoxy" name="platform/external/libepoxy" groups="pdk"/>
@@ -255,12 +278,12 @@
  <project path="external/libprotobuf-mutator" name="platform/external/libprotobuf-mutator" groups="pdk"/>
  <project path="external/libsrtp2" name="platform/external/libsrtp2" groups="pdk"/>
  <project path="external/libtextclassifier" name="platform/external/libtextclassifier" groups="pdk"/>
+  <project path="external/libunwind" name="platform/external/libunwind" groups="pdk"/>
  <project path="external/libunwind_llvm" name="platform/external/libunwind_llvm" groups="pdk"/>
  <project path="external/libusb" name="platform/external/libusb" groups="pdk"/>
  <project path="external/libutf" name="platform/external/libutf" groups="pdk"/>
  <project path="external/libvpx" name="platform/external/libvpx" groups="pdk"/>
-  <project path="external/libwebm" name="platform/external/libwebm" groups="pdk" />
-  <project path="external/libwebsockets" name="platform/external/libwebsockets" groups="pdk" />
+  <project path="external/libvterm" name="platform/external/libvterm" groups="pdk"/>
  <project path="external/libxaac" name="platform/external/libxaac" groups="pdk"/>
  <project path="external/libxkbcommon" name="platform/external/libxkbcommon" groups="pdk"/>
  <project path="external/libxml2" name="platform/external/libxml2" groups="pdk,libxml2"/>
@@ -268,13 +291,10 @@
  <project path="external/linux-kselftest" name="platform/external/linux-kselftest" groups="vts,pdk" clone-depth="1"/>
  <project path="external/llvm" name="platform/external/llvm" groups="pdk"/>
  <project path="external/lmfit" name="platform/external/lmfit" groups="pdk"/>
-  <project path="external/lottie" name="platform/external/lottie" groups="pdk" />
  <project path="external/lua" name="platform/external/lua" groups="pdk"/>
  <project path="external/ltp" name="platform/external/ltp" groups="vts,pdk"/>
  <project path="external/lz4" name="platform/external/lz4" groups="pdk"/>
-  <project path="external/llvm-project" name="toolchain/llvm-project" groups="pdk" />
  <project path="external/lzma" name="platform/external/lzma" groups="pdk"/>
-  <project path="external/marisa-trie" name="platform/external/marisa-trie" groups="pdk" />
  <project path="external/markdown" name="platform/external/markdown" groups="pdk"/>
  <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk"/>
  <project path="external/mesa3d" name="platform/external/mesa3d" groups="pdk-cw-fs,pdk-fs"/>
@@ -287,8 +307,6 @@
  <project path="external/mockwebserver" name="platform/external/mockwebserver" groups="pdk"/>
  <project path="external/modp_b64" name="platform/external/modp_b64" groups="pdk"/>
  <project path="external/mp4parser" name="platform/external/mp4parser" groups="pdk"/>
-  <project path="external/ms-tpm-20-ref" name="platform/external/ms-tpm-20-ref" groups="pdk" />
-  <project path="external/mtools" name="platform/external/mtools" groups="pdk" />
  <project path="external/mtpd" name="platform/external/mtpd" groups="pdk"/>
  <project path="external/nanohttpd" name="platform/external/nanohttpd" groups="pdk"/>
  <project path="external/nanopb-c" name="platform/external/nanopb-c" groups="pdk"/>
@@ -296,32 +314,27 @@
  <project path="external/neon_2_sse" name="platform/external/neon_2_sse" groups="pdk"/>
  <project path="external/neven" name="platform/external/neven" groups="pdk"/>
  <project path="external/newfs_msdos" name="platform/external/newfs_msdos" groups="pdk"/>
+  <project path="external/nfacct" name="platform/external/nfacct" groups="pdk"/>
  <project path="external/nist-pkits" name="platform/external/nist-pkits" groups="pdk"/>
  <project path="external/nist-sip" name="platform/external/nist-sip" groups="pdk"/>
  <project path="external/nos/host/generic" name="platform/external/nos/host/generic" groups="pdk"/>
  <project path="external/noto-fonts" name="platform/external/noto-fonts" groups="pdk"/>
  <project path="external/oauth" name="platform/external/oauth" groups="pdk"/>
  <project path="external/objenesis" name="platform/external/objenesis" groups="pdk"/>
-  <project path="external/oboe" name="platform/external/oboe" groups="pdk" />
  <project path="external/oj-libjdwp" name="platform/external/oj-libjdwp" groups="pdk"/>
  <project path="external/okhttp" name="platform/external/okhttp" groups="pdk"/>
-  <project path="external/okhttp4" name="platform/external/okhttp4" groups="pdk" />
-  <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/OpenCL-CTS" name="platform/external/OpenCL-CTS" groups="pdk"/>
  <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"/>
  <project path="external/oss-fuzz" name="platform/external/oss-fuzz" groups="pdk"/>
  <project path="external/owasp/sanitizer" name="platform/external/owasp/sanitizer" groups="pdk"/>
-  <project path="external/pffft" name="platform/external/pffft" groups="pdk" />
  <project path="external/parameter-framework" name="platform/external/parameter-framework" groups="pdk"/>
  <project path="external/pcre" name="platform/external/pcre" groups="pdk"/>
  <project path="external/pdfium" name="platform/external/pdfium" groups="pdk"/>
  <project path="external/perfetto" name="platform/external/perfetto" groups="pdk"/>
  <project path="external/piex" name="platform/external/piex" groups="pdk"/>
-  <project path="external/pigweed" name="platform/external/pigweed" groups="pdk" />
  <project path="external/ply" name="platform/external/ply" groups="pdk"/>
  <project path="external/ppp" name="platform/external/ppp" groups="pdk"/>
  <project path="external/proguard" name="platform/external/proguard" groups="pdk"/>
@@ -342,8 +355,6 @@
  <project path="external/python/google-api-python-client" name="platform/external/python/google-api-python-client" groups="vts,pdk"/>
  <project path="external/python/httplib2" name="platform/external/python/httplib2" groups="vts,pdk"/>
  <project path="external/python/ipaddress" name="platform/external/python/ipaddress" groups="pdk"/>
-  <project path="external/python/jinja" name="platform/external/python/jinja" groups="pdk" />
-  <project path="external/python/markupsafe" name="platform/external/python/markupsafe" groups="pdk" />
  <project path="external/python/mock" name="platform/external/python/mock" groups="pdk"/>
  <project path="external/python/oauth2client" name="platform/external/python/oauth2client" groups="vts,pdk"/>
  <project path="external/python/parse_type" name="platform/external/python/parse_type" groups="vts,pdk"/>
@@ -351,7 +362,6 @@
  <project path="external/python/pyasn1-modules" name="platform/external/python/pyasn1-modules" groups="vts,pdk"/>
  <project path="external/python/pybind11" name="platform/external/python/pybind11" groups="pdk"/>
  <project path="external/python/pycparser" name="platform/external/python/pycparser" groups="pdk"/>
-  <project path="external/python/pyfakefs" name="platform/external/python/pyfakefs" groups="pdk" />
  <project path="external/python/pyopenssl" name="platform/external/python/pyopenssl" groups="pdk"/>
  <project path="external/python/rsa" name="platform/external/python/rsa" groups="vts,pdk"/>
  <project path="external/python/setuptools" name="platform/external/python/setuptools" groups="vts,pdk"/>
@@ -364,183 +374,13 @@
  <project path="external/roboto-fonts" name="platform/external/roboto-fonts" groups="pdk"/>
  <project path="external/rootdev" name="platform/external/rootdev" groups="pdk"/>
  <project path="external/Reactive-Extensions/RxCpp" name="platform/external/Reactive-Extensions/RxCpp" groups="pdk"/>
-  <project path="external/rnnoise" name="platform/external/rnnoise" groups="pdk" />
-  <project path="external/rust/crates/ahash" name="platform/external/rust/crates/ahash" groups="pdk" />
-  <project path="external/rust/crates/aho-corasick" name="platform/external/rust/crates/aho-corasick" groups="pdk" />
-  <project path="external/rust/crates/android_logger" name="platform/external/rust/crates/android_logger" groups="pdk" />
-  <project path="external/rust/crates/android_log-sys" name="platform/external/rust/crates/android_log-sys" groups="pdk" />
-  <project path="external/rust/crates/anyhow" name="platform/external/rust/crates/anyhow" groups="pdk" />
-  <project path="external/rust/crates/arbitrary" name="platform/external/rust/crates/arbitrary" groups="pdk" />
-  <project path="external/rust/crates/async-stream" name="platform/external/rust/crates/async-stream" groups="pdk" />
-  <project path="external/rust/crates/async-stream-impl" name="platform/external/rust/crates/async-stream-impl" groups="pdk" />
-  <project path="external/rust/crates/async-task" name="platform/external/rust/crates/async-task" groups="pdk" />
-  <project path="external/rust/crates/async-trait" name="platform/external/rust/crates/async-trait" groups="pdk" />
-  <project path="external/rust/crates/atty" name="platform/external/rust/crates/atty" groups="pdk" />
-  <project path="external/rust/crates/base64" name="platform/external/rust/crates/base64" groups="pdk" />
-  <project path="external/rust/crates/bencher" name="platform/external/rust/crates/bencher" groups="pdk" />
-  <project path="external/rust/crates/bindgen" name="platform/external/rust/crates/bindgen" groups="pdk" />
-  <project path="external/rust/crates/bitflags" name="platform/external/rust/crates/bitflags" groups="pdk" />
-  <project path="external/rust/crates/bstr" name="platform/external/rust/crates/bstr" groups="pdk" />
  <project path="external/rust/crates/byteorder" name="platform/external/rust/crates/byteorder" groups="pdk"/>
-  <project path="external/rust/crates/bytes" name="platform/external/rust/crates/bytes" groups="pdk" />
-  <project path="external/rust/crates/cast" name="platform/external/rust/crates/cast" groups="pdk" />
-  <project path="external/rust/crates/cexpr" name="platform/external/rust/crates/cexpr" groups="pdk" />
-  <project path="external/rust/crates/cfg-if" name="platform/external/rust/crates/cfg-if" groups="pdk" />
-  <project path="external/rust/crates/chrono" name="platform/external/rust/crates/chrono" groups="pdk" />
-  <project path="external/rust/crates/clang-sys" name="platform/external/rust/crates/clang-sys" groups="pdk" />
-  <project path="external/rust/crates/clap" name="platform/external/rust/crates/clap" groups="pdk" />
-  <project path="external/rust/crates/crc32fast" name="platform/external/rust/crates/crc32fast" groups="pdk" />
-  <project path="external/rust/crates/codespan-reporting" name="platform/external/rust/crates/codespan-reporting" groups="pdk" />
-  <project path="external/rust/crates/criterion" name="platform/external/rust/crates/criterion" groups="pdk" />
-  <project path="external/rust/crates/criterion-plot" name="platform/external/rust/crates/criterion-plot" groups="pdk" />
-  <project path="external/rust/crates/crossbeam-channel" name="platform/external/rust/crates/crossbeam-channel" groups="pdk" />
-  <project path="external/rust/crates/crossbeam-deque" name="platform/external/rust/crates/crossbeam-deque" groups="pdk" />
-  <project path="external/rust/crates/crossbeam-epoch" name="platform/external/rust/crates/crossbeam-epoch" groups="pdk" />
-  <project path="external/rust/crates/crossbeam-utils" name="platform/external/rust/crates/crossbeam-utils" groups="pdk" />
-  <project path="external/rust/crates/csv" name="platform/external/rust/crates/csv" groups="pdk" />
-  <project path="external/rust/crates/csv-core" name="platform/external/rust/crates/csv-core" groups="pdk" />
-  <project path="external/rust/crates/derive_arbitrary" name="platform/external/rust/crates/derive_arbitrary" groups="pdk" />
-  <project path="external/rust/crates/downcast-rs" name="platform/external/rust/crates/downcast-rs" groups="pdk" />
-  <project path="external/rust/crates/either" name="platform/external/rust/crates/either" groups="pdk" />
-  <project path="external/rust/crates/env_logger" name="platform/external/rust/crates/env_logger" groups="pdk" />
-  <project path="external/rust/crates/fallible-iterator" name="platform/external/rust/crates/fallible-iterator" groups="pdk" />
-  <project path="external/rust/crates/fallible-streaming-iterator" name="platform/external/rust/crates/fallible-streaming-iterator" groups="pdk" />
-  <project path="external/rust/crates/flate2" name="platform/external/rust/crates/flate2" groups="pdk" />
-  <project path="external/rust/crates/fnv" name="platform/external/rust/crates/fnv" groups="pdk" />
-  <project path="external/rust/crates/form_urlencoded" name="platform/external/rust/crates/form_urlencoded" groups="pdk" />
-  <project path="external/rust/crates/futures" name="platform/external/rust/crates/futures" groups="pdk" />
-  <project path="external/rust/crates/futures-channel" name="platform/external/rust/crates/futures-channel" groups="pdk" />
-  <project path="external/rust/crates/futures-core" name="platform/external/rust/crates/futures-core" groups="pdk" />
-  <project path="external/rust/crates/futures-executor" name="platform/external/rust/crates/futures-executor" groups="pdk" />
-  <project path="external/rust/crates/futures-io" name="platform/external/rust/crates/futures-io" groups="pdk" />
-  <project path="external/rust/crates/futures-macro" name="platform/external/rust/crates/futures-macro" groups="pdk" />
-  <project path="external/rust/crates/futures-sink" name="platform/external/rust/crates/futures-sink" groups="pdk" />
-  <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/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" />
-  <project path="external/rust/crates/grpcio-compiler" name="platform/external/rust/crates/grpcio-compiler" groups="pdk" />
-  <project path="external/rust/crates/grpcio-sys" name="platform/external/rust/crates/grpcio-sys" groups="pdk" />
-  <project path="external/rust/crates/half" name="platform/external/rust/crates/half" groups="pdk" />
-  <project path="external/rust/crates/hashbrown" name="platform/external/rust/crates/hashbrown" groups="pdk" />
-  <project path="external/rust/crates/hashlink" name="platform/external/rust/crates/hashlink" groups="pdk" />
-  <project path="external/rust/crates/heck" name="platform/external/rust/crates/heck" groups="pdk" />
-  <project path="external/rust/crates/idna" name="platform/external/rust/crates/idna" groups="pdk" />
-  <project path="external/rust/crates/instant" name="platform/external/rust/crates/instant" groups="pdk" />
-  <project path="external/rust/crates/intrusive-collections" name="platform/external/rust/crates/intrusive-collections" groups="pdk" />
-  <project path="external/rust/crates/itertools" name="platform/external/rust/crates/itertools" groups="pdk" />
-  <project path="external/rust/crates/itoa" name="platform/external/rust/crates/itoa" groups="pdk" />
-  <project path="external/rust/crates/lazy_static" name="platform/external/rust/crates/lazy_static" groups="pdk" />
-  <project path="external/rust/crates/lazycell" name="platform/external/rust/crates/lazycell" groups="pdk" />
  <project path="external/rust/crates/libc" name="platform/external/rust/crates/libc" groups="pdk"/>
-  <project path="external/rust/crates/libfuzzer-sys" name="platform/external/rust/crates/libfuzzer-sys" groups="pdk" />
-  <project path="external/rust/crates/libloading" name="platform/external/rust/crates/libloading" groups="pdk" />
-  <project path="external/rust/crates/libm" name="platform/external/rust/crates/libm" groups="pdk" />
-  <project path="external/rust/crates/libsqlite3-sys" name="platform/external/rust/crates/libsqlite3-sys" groups="pdk" />
-  <project path="external/rust/crates/libz-sys" name="platform/external/rust/crates/libz-sys" groups="pdk" />
-  <project path="external/rust/crates/linked-hash-map" name="platform/external/rust/crates/linked-hash-map" groups="pdk" />
-  <project path="external/rust/crates/lock_api" name="platform/external/rust/crates/lock_api" groups="pdk" />
-  <project path="external/rust/crates/log" name="platform/external/rust/crates/log" groups="pdk" />
-  <project path="external/rust/crates/lru-cache" name="platform/external/rust/crates/lru-cache" groups="pdk" />
-  <project path="external/rust/crates/macaddr" name="platform/external/rust/crates/macaddr" groups="pdk" />
-  <project path="external/rust/crates/managed" name="platform/external/rust/crates/managed" groups="pdk" />
-  <project path="external/rust/crates/matches" name="platform/external/rust/crates/matches" groups="pdk" />
-  <project path="external/rust/crates/memchr" name="platform/external/rust/crates/memchr" groups="pdk" />
-  <project path="external/rust/crates/memoffset" name="platform/external/rust/crates/memoffset" groups="pdk" />
-  <project path="external/rust/crates/mio" name="platform/external/rust/crates/mio" groups="pdk" />
-  <project path="external/rust/crates/nix" name="platform/external/rust/crates/nix" groups="pdk" />
-  <project path="external/rust/crates/no-panic" name="platform/external/rust/crates/no-panic" groups="pdk" />
-  <project path="external/rust/crates/nom" name="platform/external/rust/crates/nom" groups="pdk" />
-  <project path="external/rust/crates/num-derive" name="platform/external/rust/crates/num-derive" groups="pdk" />
-  <project path="external/rust/crates/num-integer" name="platform/external/rust/crates/num-integer" groups="pdk" />
-  <project path="external/rust/crates/num-traits" name="platform/external/rust/crates/num-traits" groups="pdk" />
-  <project path="external/rust/crates/num_cpus" name="platform/external/rust/crates/num_cpus" groups="pdk" />
-  <project path="external/rust/crates/once_cell" name="platform/external/rust/crates/once_cell" groups="pdk" />
-  <project path="external/rust/crates/oorandom" name="platform/external/rust/crates/oorandom" groups="pdk" />
-  <project path="external/rust/crates/parking_lot" name="platform/external/rust/crates/parking_lot" groups="pdk" />
-  <project path="external/rust/crates/parking_lot_core" name="platform/external/rust/crates/parking_lot_core" groups="pdk" />
-  <project path="external/rust/crates/paste" name="platform/external/rust/crates/paste" groups="pdk" />
-  <project path="external/rust/crates/peeking_take_while" name="platform/external/rust/crates/peeking_take_while" groups="pdk" />
-  <project path="external/rust/crates/percent-encoding" name="platform/external/rust/crates/percent-encoding" groups="pdk" />
-  <project path="external/rust/crates/pin-project" name="platform/external/rust/crates/pin-project" groups="pdk" />
-  <project path="external/rust/crates/pin-project-internal" name="platform/external/rust/crates/pin-project-internal" groups="pdk" />
-  <project path="external/rust/crates/pin-project-lite" name="platform/external/rust/crates/pin-project-lite" groups="pdk" />
-  <project path="external/rust/crates/pin-utils" name="platform/external/rust/crates/pin-utils" groups="pdk" />
-  <project path="external/rust/crates/plotters" name="platform/external/rust/crates/plotters" groups="pdk" />
-  <project path="external/rust/crates/plotters-backend" name="platform/external/rust/crates/plotters-backend" groups="pdk" />
-  <project path="external/rust/crates/plotters-svg" name="platform/external/rust/crates/plotters-svg" groups="pdk" />
-  <project path="external/rust/crates/ppv-lite86" name="platform/external/rust/crates/ppv-lite86" groups="pdk" />
-  <project path="external/rust/crates/proc-macro-error" name="platform/external/rust/crates/proc-macro-error" groups="pdk" />
-  <project path="external/rust/crates/proc-macro-error-attr" name="platform/external/rust/crates/proc-macro-error-attr" groups="pdk" />
-  <project path="external/rust/crates/proc-macro-hack" name="platform/external/rust/crates/proc-macro-hack" groups="pdk" />
-  <project path="external/rust/crates/proc-macro-nested" name="platform/external/rust/crates/proc-macro-nested" groups="pdk" />
  <project path="external/rust/crates/proc-macro2" name="platform/external/rust/crates/proc-macro2" groups="pdk"/>
-  <project path="external/rust/crates/protobuf" name="platform/external/rust/crates/protobuf" groups="pdk" />
-  <project path="external/rust/crates/protobuf-codegen" name="platform/external/rust/crates/protobuf-codegen" groups="pdk" />
-  <project path="external/rust/crates/quiche" name="platform/external/rust/crates/quiche" groups="pdk" />
  <project path="external/rust/crates/quote" name="platform/external/rust/crates/quote" groups="pdk"/>
-  <project path="external/rust/crates/rand" name="platform/external/rust/crates/rand" groups="pdk" />
-  <project path="external/rust/crates/rand_chacha" name="platform/external/rust/crates/rand_chacha" groups="pdk" />
-  <project path="external/rust/crates/rand_core" name="platform/external/rust/crates/rand_core" groups="pdk" />
-  <project path="external/rust/crates/rand_xorshift" name="platform/external/rust/crates/rand_xorshift" groups="pdk" />
-  <project path="external/rust/crates/rayon" name="platform/external/rust/crates/rayon" groups="pdk" />
-  <project path="external/rust/crates/rayon-core" name="platform/external/rust/crates/rayon-core" groups="pdk" />
-  <project path="external/rust/crates/regex" name="platform/external/rust/crates/regex" groups="pdk" />
-  <project path="external/rust/crates/regex-automata" name="platform/external/rust/crates/regex-automata" groups="pdk" />
-  <project path="external/rust/crates/regex-syntax" name="platform/external/rust/crates/regex-syntax" groups="pdk" />
  <project path="external/rust/crates/remain" name="platform/external/rust/crates/remain" groups="pdk"/>
-  <project path="external/rust/crates/ring" name="platform/external/rust/crates/ring" groups="pdk" />
-  <project path="external/rust/crates/rusqlite" name="platform/external/rust/crates/rusqlite" groups="pdk" />
-  <project path="external/rust/crates/rustc-hash" name="platform/external/rust/crates/rustc-hash" groups="pdk" />
-  <project path="external/rust/crates/rustversion" name="platform/external/rust/crates/rustversion" groups="pdk" />
-  <project path="external/rust/crates/ryu" name="platform/external/rust/crates/ryu" groups="pdk" />
-  <project path="external/rust/crates/same-file" name="platform/external/rust/crates/same-file" groups="pdk" />
-  <project path="external/rust/crates/scopeguard" name="platform/external/rust/crates/scopeguard" groups="pdk" />
-  <project path="external/rust/crates/serde" name="platform/external/rust/crates/serde" groups="pdk" />
-  <project path="external/rust/crates/serde_cbor" name="platform/external/rust/crates/serde_cbor" groups="pdk" />
-  <project path="external/rust/crates/serde_derive" name="platform/external/rust/crates/serde_derive" groups="pdk" />
-  <project path="external/rust/crates/serde_json" name="platform/external/rust/crates/serde_json" groups="pdk" />
-  <project path="external/rust/crates/serde_test" name="platform/external/rust/crates/serde_test" groups="pdk" />
-  <project path="external/rust/crates/shared_child" name="platform/external/rust/crates/shared_child" groups="pdk" />
-  <project path="external/rust/crates/shlex" name="platform/external/rust/crates/shlex" groups="pdk" />
-  <project path="external/rust/crates/slab" name="platform/external/rust/crates/slab" groups="pdk" />
-  <project path="external/rust/crates/smallvec" name="platform/external/rust/crates/smallvec" groups="pdk" />
-  <project path="external/rust/crates/spin" name="platform/external/rust/crates/spin" groups="pdk" />
-  <project path="external/rust/crates/structopt" name="platform/external/rust/crates/structopt" groups="pdk" />
-  <project path="external/rust/crates/structopt-derive" name="platform/external/rust/crates/structopt-derive" groups="pdk" />
  <project path="external/rust/crates/syn" name="platform/external/rust/crates/syn" groups="pdk"/>
-  <project path="external/rust/crates/syn-mid" name="platform/external/rust/crates/syn-mid" groups="pdk" />
-  <project path="external/rust/crates/termcolor" name="platform/external/rust/crates/termcolor" groups="pdk" />
-  <project path="external/rust/crates/textwrap" name="platform/external/rust/crates/textwrap" groups="pdk" />
-  <project path="external/rust/crates/thiserror" name="platform/external/rust/crates/thiserror" groups="pdk" />
-  <project path="external/rust/crates/thiserror-impl" name="platform/external/rust/crates/thiserror-impl" groups="pdk" />
-  <project path="external/rust/crates/thread_local" name="platform/external/rust/crates/thread_local" groups="pdk" />
-  <project path="external/rust/crates/tinytemplate" name="platform/external/rust/crates/tinytemplate" groups="pdk" />
-  <project path="external/rust/crates/tinyvec" name="platform/external/rust/crates/tinyvec" groups="pdk" />
-  <project path="external/rust/crates/tinyvec_macros" name="platform/external/rust/crates/tinyvec_macros" groups="pdk" />
-  <project path="external/rust/crates/tokio" name="platform/external/rust/crates/tokio" groups="pdk" />
-  <project path="external/rust/crates/tokio-macros" name="platform/external/rust/crates/tokio-macros" groups="pdk" />
-  <project path="external/rust/crates/tokio-stream" name="platform/external/rust/crates/tokio-stream" groups="pdk" />
-  <project path="external/rust/crates/tokio-test" name="platform/external/rust/crates/tokio-test" groups="pdk" />
-  <project path="external/rust/crates/unicode-bidi" name="platform/external/rust/crates/unicode-bidi" groups="pdk" />
-  <project path="external/rust/crates/unicode-normalization" name="platform/external/rust/crates/unicode-normalization" groups="pdk" />
-  <project path="external/rust/crates/unicode-segmentation" name="platform/external/rust/crates/unicode-segmentation" groups="pdk" />
-  <project path="external/rust/crates/unicode-width" name="platform/external/rust/crates/unicode-width" groups="pdk" />
  <project path="external/rust/crates/unicode-xid" name="platform/external/rust/crates/unicode-xid" groups="pdk"/>
-  <project path="external/rust/crates/untrusted" name="platform/external/rust/crates/untrusted" groups="pdk" />
-  <project path="external/rust/crates/url" name="platform/external/rust/crates/url" groups="pdk" />
-  <project path="external/rust/crates/uuid" name="platform/external/rust/crates/uuid" groups="pdk" />
-  <project path="external/rust/crates/vmm_vhost" name="platform/external/rust/crates/vmm_vhost" groups="pdk" />
-  <project path="external/rust/crates/vsock" name="platform/external/rust/crates/vsock" groups="pdk" />
-  <project path="external/rust/crates/walkdir" name="platform/external/rust/crates/walkdir" groups="pdk" />
-  <project path="external/rust/crates/weak-table" name="platform/external/rust/crates/weak-table" groups="pdk" />
-  <project path="external/rust/crates/which" name="platform/external/rust/crates/which" groups="pdk" />
-  <project path="external/rust/crates/zip" name="platform/external/rust/crates/zip" groups="pdk" />
-  <project path="external/rust/cxx" name="platform/external/rust/cxx" groups="pdk" />
-  <project path="external/ruy" name="platform/external/ruy" groups="pdk" />
-  <project path="external/s2-geometry-library-java" name="platform/external/s2-geometry-library-java" groups="pdk" />
  <project path="external/scapy" name="platform/external/scapy" groups="pdk-fs"/>
  <project path="external/scrypt" name="platform/external/scrypt" groups="pdk"/>
  <project path="external/scudo" name="platform/external/scudo" groups="pdk"/>
@@ -562,7 +402,6 @@
  <project path="external/speex" name="platform/external/speex" groups="pdk"/>
  <project path="external/sqlite" name="platform/external/sqlite" groups="pdk"/>
  <project path="external/squashfs-tools" name="platform/external/squashfs-tools" groups="pdk"/>
-  <project path="external/starlark-go" name="platform/external/starlark-go" groups="pdk" />
  <project path="external/strace" name="platform/external/strace" groups="pdk"/>
  <project path="external/stressapptest" name="platform/external/stressapptest" groups="pdk"/>
  <project path="external/subsampling-scale-image-view" name="platform/external/subsampling-scale-image-view" groups="pdk" clone-depth="1"/>
@@ -571,26 +410,23 @@
  <project path="external/tcpdump" name="platform/external/tcpdump" groups="pdk"/>
  <project path="external/tensorflow" name="platform/external/tensorflow" 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" />
  <project path="external/tinyalsa" name="platform/external/tinyalsa" groups="pdk"/>
-  <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/tinyxml" name="platform/external/tinyxml" 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/u-boot" name="platform/external/u-boot" 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/v8" name="platform/external/v8" 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"/>
@@ -609,7 +445,6 @@
  <project path="external/yapf" name="platform/external/yapf" groups="vts,projectarch,pdk"/>
  <project path="external/zlib" name="platform/external/zlib" groups="pdk"/>
  <project path="external/zopfli" name="platform/external/zopfli" groups="pdk"/>
-  <project path="external/zstd" name="platform/external/zstd" groups="pdk" />
  <project path="external/zxing" name="platform/external/zxing" groups="pdk"/>
  <project path="frameworks/av" name="platform/frameworks/av" groups="pdk"/>
  <project path="frameworks/base" name="platform/frameworks/base" groups="pdk-cw-fs,pdk-fs"/>
@@ -621,10 +456,10 @@
  <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" groups="pdk-cw-fs,pdk-fs"/>
  <project path="frameworks/libs/systemui" name="platform/frameworks/libs/systemui" groups="pdk-cw-fs,pdk-fs"/>
  <project path="frameworks/libs/modules-utils" name="platform/frameworks/libs/modules-utils" groups="pdk-cw-fs,pdk-fs"/>
-  <project path="frameworks/libs/net" name="platform/frameworks/libs/net" groups="pdk-cw-fs,pdk-fs" />
  <project path="frameworks/libs/native_bridge_support" name="platform/frameworks/libs/native_bridge_support" groups="pdk"/>
-  <project path="frameworks/libs/service_entitlement" name="platform/frameworks/libs/service_entitlement" groups="pdk" />
+  <project path="frameworks/libs/net" name="platform/frameworks/libs/net" groups="pdk-cw-fs,pdk-fs"/>
  <project path="frameworks/minikin" name="platform/frameworks/minikin" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="frameworks/ml" name="platform/frameworks/ml" groups="pdk"/>
  <project path="frameworks/multidex" name="platform/frameworks/multidex" groups="pdk-cw-fs,pdk-fs"/>
  <project path="frameworks/native" name="platform/frameworks/native" groups="pdk"/>
  <project path="frameworks/opt/bitmap" name="platform/frameworks/opt/bitmap" groups="pdk-fs"/>
@@ -644,95 +479,197 @@
  <project path="frameworks/opt/timezonepicker" name="platform/frameworks/opt/timezonepicker" groups="pdk-cw-fs,pdk-fs"/>
  <project path="frameworks/opt/tv/tvsystem" name="platform/frameworks/opt/tv/tvsystem" groups="pdk-cw-fs,pdk-fs"/>
  <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" groups="pdk-cw-fs,pdk-fs"/>
-  <project path="frameworks/proto_logging" name="platform/frameworks/proto_logging" groups="pdk-cw-fs,pdk-fs" />
  <project path="frameworks/rs" name="platform/frameworks/rs" groups="pdk"/>
  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="pdk"/>
+  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="pdk,broadcom_wlan"/>
  <project path="hardware/google/apf" name="platform/hardware/google/apf" groups="pdk"/>
+  <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/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"/>
  <project path="hardware/interfaces" name="platform/hardware/interfaces" groups="pdk"/>
+  <project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense,pdk"/>
+  <project path="hardware/knowles/athletico/sound_trigger_hal" name="platform/hardware/knowles/athletico/sound_trigger_hal" groups="coral,generic_fs"/>
  <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk"/>
  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="pdk"/>
+  <project path="hardware/nxp/nfc" name="platform/hardware/nxp/nfc" groups="pdk"/>
+  <project path="hardware/nxp/secure_element" name="platform/hardware/nxp/secure_element" groups="pdk"/>
+  <project path="hardware/qcom/audio" name="platform/hardware/qcom/audio" groups="qcom,qcom_audio,pdk-qcom"/>
+  <project path="hardware/qcom/bootctrl" name="platform/hardware/qcom/bootctrl" groups="pdk-qcom"/>
+  <project path="hardware/qcom/bt" name="platform/hardware/qcom/bt" groups="qcom,pdk-qcom"/>
+  <project path="hardware/qcom/camera" name="platform/hardware/qcom/camera" groups="qcom_camera,pdk-qcom"/>
+  <project path="hardware/qcom/data/ipacfg-mgr" name="platform/hardware/qcom/data/ipacfg-mgr" groups="qcom,pdk-qcom"/>
+  <project path="hardware/qcom/display" name="platform/hardware/qcom/display" groups="pdk-qcom,qcom,qcom_display"/>
+  <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" groups="qcom,qcom_gps,pdk-qcom"/>
+  <project path="hardware/qcom/keymaster" name="platform/hardware/qcom/keymaster" groups="qcom,qcom_keymaster,pdk-qcom"/>
+  <project path="hardware/qcom/media" name="platform/hardware/qcom/media" groups="qcom,pdk-qcom"/>
+  <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/msm8998" name="platform/hardware/qcom/msm8998" groups="qcom_msm8998,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"/>
+  <project path="hardware/qcom/neuralnetworks/hvxservice" name="platform/hardware/qcom/neuralnetworks/hvxservice" groups="wahoo"/>
+  <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom,pdk-qcom"/>
+  <project path="hardware/qcom/sdm845/bt" name="platform/hardware/qcom/sdm845/bt" groups="generic_fs,qcom_sdm845"/>
+  <project path="hardware/qcom/sdm845/data/ipacfg-mgr" name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" groups="generic_fs,vendor,qcom_sdm845">
+    <linkfile src="os_pickup.mk" dest="hardware/qcom/sdm845/Android.mk"/>
+    <linkfile src="os_pickup.bp" dest="hardware/qcom/sdm845/Android.bp"/>
+  </project>
+  <project path="hardware/qcom/sdm845/display" name="platform/hardware/qcom/sdm845/display" groups="generic_fs,qcom_sdm845"/>
+  <project path="hardware/qcom/sdm845/gps" name="platform/hardware/qcom/sdm845/gps" groups="generic_fs,qcom_sdm845"/>
+  <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/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/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/ti/am57x" name="platform/hardware/ti/am57x" groups="pdk"/>
+  <project path="kernel/build" name="kernel/build"/>
  <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"/>
-  <project path="kernel/prebuilts/5.4/arm64" name="kernel/prebuilts/5.4/arm64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/5.4/x86_64" name="kernel/prebuilts/5.4/x86-64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/5.10/arm64" name="kernel/prebuilts/5.10/arm64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/5.10/x86_64" name="kernel/prebuilts/5.10/x86-64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/mainline/arm64" name="kernel/prebuilts/mainline/arm64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/common-modules/virtual-device/4.19/arm64" name="kernel/prebuilts/common-modules/virtual-device/4.19/arm64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/common-modules/virtual-device/4.19/x86-64" name="kernel/prebuilts/common-modules/virtual-device/4.19/x86-64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/common-modules/virtual-device/5.10/arm64" name="kernel/prebuilts/common-modules/virtual-device/5.10/arm64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/common-modules/virtual-device/5.10/x86-64" name="kernel/prebuilts/common-modules/virtual-device/5.10/x86-64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/common-modules/virtual-device/5.4/arm64" name="kernel/prebuilts/common-modules/virtual-device/5.4/arm64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/common-modules/virtual-device/5.4/x86-64" name="kernel/prebuilts/common-modules/virtual-device/5.4/x86-64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/common-modules/virtual-device/mainline/arm64" name="kernel/prebuilts/common-modules/virtual-device/mainline/arm64" groups="pdk" clone-depth="1" />
-  <project path="kernel/prebuilts/common-modules/virtual-device/mainline/x86-64" name="kernel/prebuilts/common-modules/virtual-device/mainline/x86-64" groups="pdk" clone-depth="1" />
  <project path="kernel/tests" name="kernel/tests" groups="vts,pdk"/>
  <project path="libcore" name="platform/libcore" groups="pdk"/>
  <project path="libnativehelper" name="platform/libnativehelper" groups="pdk"/>
+  <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/apps/Browser2" name="platform/packages/apps/Browser2" groups="pdk-fs"/>
  <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" groups="pdk-fs"/>
+  <project path="packages/apps/Camera2" name="platform/packages/apps/Camera2" groups="pdk-fs"/>
+  <project path="packages/apps/Car/Calendar" name="platform/packages/apps/Car/Calendar" groups="pdk-fs"/>
+  <project path="packages/apps/Car/Cluster" name="platform/packages/apps/Car/Cluster" groups="pdk-fs"/>
+  <project path="packages/apps/Car/CompanionDeviceSupport" name="platform/packages/apps/Car/CompanionDeviceSupport" groups="pdk-fs"/>
+  <project path="packages/apps/Car/Dialer" name="platform/packages/apps/Car/Dialer" groups="pdk-fs"/>
+  <project path="packages/apps/Car/Hvac" name="platform/packages/apps/Car/Hvac" groups="pdk-fs"/>
+  <project path="packages/apps/Car/LatinIME" name="platform/packages/apps/Car/LatinIME" groups="pdk-fs"/>
+  <project path="packages/apps/Car/Launcher" name="platform/packages/apps/Car/Launcher" groups="pdk-fs"/>
+  <project path="packages/apps/Car/LinkViewer" name="platform/packages/apps/Car/LinkViewer" groups="pdk-fs"/>
+  <project path="packages/apps/Car/LocalMediaPlayer" name="platform/packages/apps/Car/LocalMediaPlayer" groups="pdk-fs"/>
+  <project path="packages/apps/Car/Media" name="platform/packages/apps/Car/Media" groups="pdk-fs"/>
+  <project path="packages/apps/Car/Messenger" name="platform/packages/apps/Car/Messenger" groups="pdk-fs"/>
+  <project path="packages/apps/Car/Notification" name="platform/packages/apps/Car/Notification" groups="pdk-fs"/>
+  <project path="packages/apps/Car/Radio" name="platform/packages/apps/Car/Radio" groups="pdk-fs"/>
  <project path="packages/apps/Car/RotaryController" name="platform/packages/apps/Car/RotaryController" groups="pdk-fs"/>
+  <project path="packages/apps/Car/Settings" name="platform/packages/apps/Car/Settings" groups="pdk-fs"/>
+  <project path="packages/apps/Car/SystemUpdater" name="platform/packages/apps/Car/SystemUpdater" groups="pdk-fs"/>
  <project path="packages/apps/Car/libs" name="platform/packages/apps/Car/libs" groups="pdk-fs"/>
+  <project path="packages/apps/Car/tests" name="platform/packages/apps/Car/tests" groups="pdk-fs"/>
  <project path="packages/apps/CarrierConfig" name="platform/packages/apps/CarrierConfig" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" groups="pdk-fs"/>
+  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" groups="pdk-fs"/>
+  <project path="packages/apps/DevCamera" name="platform/packages/apps/DevCamera" groups="pdk"/>
+  <project path="packages/apps/Dialer" name="platform/packages/apps/Dialer" groups="pdk-fs"/>
  <project path="packages/apps/DocumentsUI" name="platform/packages/apps/DocumentsUI" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/apps/EmergencyInfo" name="platform/packages/apps/EmergencyInfo" groups="pdk-fs"/>
+  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" groups="pdk-fs"/>
+  <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" groups="pdk-fs"/>
+  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" groups="pdk-fs"/>
+  <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" groups="pdk-fs"/>
  <project path="packages/apps/Launcher3" name="platform/packages/apps/Launcher3" groups="pdk-fs"/>
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" groups="pdk-fs"/>
  <project path="packages/apps/ManagedProvisioning" name="platform/packages/apps/ManagedProvisioning" groups="pdk-fs"/>
+  <project path="packages/apps/Messaging" name="platform/packages/apps/Messaging" groups="pdk-fs"/>
+  <project path="packages/apps/Music" name="platform/packages/apps/Music" groups="pdk-fs"/>
+  <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" groups="pdk-fs"/>
  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" groups="apps_nfc,pdk-fs"/>
+  <project path="packages/apps/OnDeviceAppPrediction" name="platform/packages/apps/OnDeviceAppPrediction" groups="pdk-fs"/>
+  <project path="packages/apps/OneTimeInitializer" name="platform/packages/apps/OneTimeInitializer" groups="pdk-fs"/>
+  <project path="packages/apps/PermissionController" name="platform/packages/apps/PackageInstaller" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/apps/PhoneCommon" name="platform/packages/apps/PhoneCommon" groups="pdk-cw-fs,pdk-fs"/>
-  <project path="packages/apps/RemoteProvisioner" name="platform/packages/apps/RemoteProvisioner" groups="pdk-fs" />
+  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" groups="pdk-fs"/>
+  <project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="pdk-fs"/>
+  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" groups="pdk-fs"/>
+  <project path="packages/apps/QuickAccessWallet" name="platform/packages/apps/QuickAccessWallet" groups="pdk-fs"/>
+  <project path="packages/apps/SafetyRegulatoryInfo" name="platform/packages/apps/SafetyRegulatoryInfo" groups="pdk-fs"/>
+  <project path="packages/apps/SampleLocationAttribution" name="platform/packages/apps/SampleLocationAttribution" groups="pdk-fs"/>
+  <project path="packages/apps/SecureElement" name="platform/packages/apps/SecureElement" groups="apps_se,pdk-fs"/>
  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" groups="pdk-fs"/>
+  <project path="packages/apps/SettingsIntelligence" name="platform/packages/apps/SettingsIntelligence" groups="pdk-fs"/>
+  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" groups="pdk-fs"/>
+  <project path="packages/apps/SpareParts" name="platform/packages/apps/SpareParts" groups="pdk-fs"/>
+  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" groups="apps_stk,pdk-fs"/>
  <project path="packages/apps/StorageManager" name="platform/packages/apps/StorageManager" groups="pdk-fs"/>
+  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" groups="pdk-fs"/>
+  <project path="packages/apps/Terminal" name="platform/packages/apps/Terminal" groups="pdk-fs"/>
+  <project path="packages/apps/Test/connectivity" name="platform/packages/apps/Test/connectivity" groups="pdk"/>
  <project path="packages/apps/TimeZoneData" name="platform/packages/apps/TimeZoneData" groups="pdk"/>
+  <project path="packages/apps/TimeZoneUpdater" name="platform/packages/apps/TimeZoneUpdater" groups="pdk"/>
+  <project path="packages/apps/ThemePicker" name="platform/packages/apps/ThemePicker" groups="pdk-fs"/>
  <project path="packages/apps/Traceur" name="platform/packages/apps/Traceur" groups="pdk-fs"/>
-  <project path="packages/modules/adb" name="platform/packages/modules/adb" groups="pdk" />
+  <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"/>
+  <project path="packages/inputmethods/LeanbackIME" name="platform/packages/inputmethods/LeanbackIME" groups="pdk-fs"/>
  <project path="packages/modules/ArtPrebuilt" name="platform/packages/modules/ArtPrebuilt" groups="pdk" clone-depth="1"/>
  <project path="packages/modules/CaptivePortalLogin" name="platform/packages/modules/CaptivePortalLogin" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/modules/CellBroadcastService" name="platform/packages/modules/CellBroadcastService" groups="pdk"/>
-  <project path="packages/modules/common" name="platform/packages/modules/common" groups="pdk-cw-fs,pdk-fs" />
-  <project path="packages/modules/Connectivity" name="platform/packages/modules/Connectivity" groups="pdk-cw-fs,pdk-fs" />
  <project path="packages/modules/Cronet" name="platform/packages/modules/Cronet" groups="pdk-cw-fs,pdk-fs"/>
-  <project path="packages/modules/ExtServices" name="platform/packages/modules/ExtServices" groups="pdk-cw-fs,pdk-fs" />
-  <project path="packages/modules/GeoTZ" name="platform/packages/modules/GeoTZ" groups="pdk-cw-fs,pdk-fs" />
-  <project path="packages/modules/Gki" name="platform/packages/modules/Gki" groups="pdk-cw-fs,pdk-fs" />
-  <project path="packages/modules/IPsec" name="platform/packages/modules/IPsec" groups="pdk" />
  <project path="packages/modules/DnsResolver" name="platform/packages/modules/DnsResolver" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/modules/ExtServices" name="platform/packages/modules/ExtServices" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/modules/IPsec" name="platform/packages/modules/IPsec" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/modules/ModuleMetadata" name="platform/packages/modules/ModuleMetadata" groups="pdk"/>
  <project path="packages/modules/NetworkPermissionConfig" name="platform/packages/modules/NetworkPermissionConfig" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/modules/NetworkStack" name="platform/packages/modules/NetworkStack" groups="pdk-cw-fs,pdk-fs"/>
-  <project path="packages/modules/NeuralNetworks" name="platform/packages/modules/NeuralNetworks" groups="pdk-cw-fs,pdk-fs" />
-  <project path="packages/modules/Permission" name="platform/packages/modules/Permission" groups="pdk-cw-fs,pdk-fs" />
-  <project path="packages/modules/RuntimeI18n" name="platform/packages/modules/RuntimeI18n" groups="pdk-cw-fs,pdk-fs" />
-  <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" />
  <project path="packages/providers/BlockedNumberProvider" name="platform/packages/providers/BlockedNumberProvider" groups="pdk-fs"/>
+  <project path="packages/providers/BookmarkProvider" name="platform/packages/providers/BookmarkProvider" groups="pdk-fs"/>
  <project path="packages/providers/CalendarProvider" name="platform/packages/providers/CalendarProvider" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/providers/CallLogProvider" name="platform/packages/providers/CallLogProvider" groups="pdk-fs"/>
  <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/providers/DownloadProvider" name="platform/packages/providers/DownloadProvider" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" groups="pdk-fs"/>
  <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/providers/TvProvider" name="platform/packages/providers/TvProvider" groups="pdk-fs"/>
+  <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" groups="pdk-fs"/>
+  <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" groups="pdk-fs"/>
+  <project path="packages/services/BuiltInPrintService" name="platform/packages/services/BuiltInPrintService" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/services/AlternativeNetworkAccess" name="platform/packages/services/AlternativeNetworkAccess" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/services/Car" name="platform/packages/services/Car" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/services/Mms" name="platform/packages/services/Mms" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/services/Mtp" name="platform/packages/services/Mtp" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/services/Telecomm" name="platform/packages/services/Telecomm" groups="pdk-cw-fs,pdk-fs"/>
  <project path="packages/services/Telephony" name="platform/packages/services/Telephony" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/wallpapers/ImageWallpaper" name="platform/packages/wallpapers/ImageWallpaper" groups="pdk-fs"/>
+  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" groups="pdk-fs"/>
+  <project path="pdk" name="platform/pdk" groups="pdk"/>
  <project path="platform_testing" name="platform/platform_testing" groups="pdk-fs,pdk-cw-fs,cts"/>
  <project path="prebuilts/abi-dumps/ndk" name="platform/prebuilts/abi-dumps/ndk" groups="pdk-fs" clone-depth="1"/>
  <project path="prebuilts/abi-dumps/platform" name="platform/prebuilts/abi-dumps/platform" groups="pdk-fs" clone-depth="1"/>
  <project path="prebuilts/abi-dumps/vndk" name="platform/prebuilts/abi-dumps/vndk" groups="pdk-fs" clone-depth="1"/>
  <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" groups="pdk-fs" clone-depth="1"/>
  <project path="prebuilts/asuite" name="platform/prebuilts/asuite" groups="pdk" clone-depth="1"/>
-  <project path="prebuilts/bazel/darwin-x86_64" name="platform/prebuilts/bazel/darwin-x86_64" groups="darwin,pdk" clone-depth="1" />
-  <project path="prebuilts/bazel/linux-x86_64" name="platform/prebuilts/bazel/linux-x86_64" groups="linux,pdk" clone-depth="1" />
  <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" groups="pdk" clone-depth="1"/>
  <project path="prebuilts/bundletool" name="platform/prebuilts/bundletool" groups="pdk" clone-depth="1"/>
  <project path="prebuilts/checkcolor" name="platform/prebuilts/checkcolor" groups="pdk" clone-depth="1"/>
@@ -742,14 +679,17 @@
  <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" groups="pdk" clone-depth="1"/>
  <project path="prebuilts/cmdline-tools" name="platform/prebuilts/cmdline-tools" groups="pdk-fs" clone-depth="1"/>
  <project path="prebuilts/devtools" name="platform/prebuilts/devtools" groups="pdk-fs" clone-depth="1"/>
+  <project path="prebuilts/fuchsia_sdk" name="platform/prebuilts/fuchsia_sdk" groups="pdk-fs" clone-depth="1"/>
  <project path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,darwin,arm" clone-depth="1"/>
  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" groups="pdk,darwin,arm" clone-depth="1"/>
  <project path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" groups="pdk,darwin" clone-depth="1"/>
+  <project path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" groups="pdk,darwin,mips" clone-depth="1"/>
  <project path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" groups="pdk,darwin,x86" clone-depth="1"/>
  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,linux,arm" clone-depth="1"/>
  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" groups="pdk,linux,arm" clone-depth="1"/>
  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" groups="pdk,linux" clone-depth="1"/>
  <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" groups="pdk-fs" clone-depth="1"/>
+  <project path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" groups="pdk,linux,mips" clone-depth="1"/>
  <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" groups="pdk,linux,x86" clone-depth="1"/>
  <project path="prebuilts/gdb/darwin-x86" name="platform/prebuilts/gdb/darwin-x86" groups="darwin,pdk" clone-depth="1"/>
  <project path="prebuilts/gdb/linux-x86" name="platform/prebuilts/gdb/linux-x86" groups="linux,pdk" clone-depth="1"/>
@@ -764,16 +704,6 @@
  <project path="prebuilts/maven_repo/bumptech" name="platform/prebuilts/maven_repo/bumptech" groups="pdk-cw-fs,pdk-fs" clone-depth="1"/>
  <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="pdk" clone-depth="1"/>
  <project path="prebuilts/module_sdk/art" name="platform/prebuilts/module_sdk/art" groups="pdk" clone-depth="1"/>
-  <project path="prebuilts/module_sdk/conscrypt" name="platform/prebuilts/module_sdk/conscrypt" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/module_sdk/Connectivity" name="platform/prebuilts/module_sdk/Connectivity" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/module_sdk/IPsec" name="platform/prebuilts/module_sdk/IPsec" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/module_sdk/Media" name="platform/prebuilts/module_sdk/Media" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/module_sdk/MediaProvider" name="platform/prebuilts/module_sdk/MediaProvider" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/module_sdk/Permission" name="platform/prebuilts/module_sdk/Permission" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/module_sdk/Scheduling" name="platform/prebuilts/module_sdk/Scheduling" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/module_sdk/SdkExtensions" name="platform/prebuilts/module_sdk/SdkExtensions" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/module_sdk/StatsD" name="platform/prebuilts/module_sdk/StatsD" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/module_sdk/Wifi" name="platform/prebuilts/module_sdk/Wifi" groups="pdk" clone-depth="1" />
  <project path="prebuilts/ndk" name="platform/prebuilts/ndk" groups="pdk" clone-depth="1"/>
  <project path="prebuilts/ktlint" name="platform/prebuilts/ktlint" groups="pdk" clone-depth="1"/>
  <project path="prebuilts/python/darwin-x86/2.7.5" name="platform/prebuilts/python/darwin-x86/2.7.5" groups="darwin,pdk,pdk-cw-fs,pdk-fs" clone-depth="1"/>
@@ -783,11 +713,13 @@
  <project path="prebuilts/runtime" name="platform/prebuilts/runtime" groups="pdk" clone-depth="1"/>
  <project path="prebuilts/rust" name="platform/prebuilts/rust" groups="pdk" clone-depth="1"/>
  <project path="prebuilts/r8" name="platform/prebuilts/r8" groups="pdk" clone-depth="1"/>
-  <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="pdk" clone-depth="1" />
+  <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="pdk" clone-depth="1">
+    <linkfile src="current/androidx-README.md" dest="frameworks/support.md"/>
+  </project>
  <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="pdk,tools" clone-depth="1"/>
+  <project path="prebuilts/vndk/v27" name="platform/prebuilts/vndk/v27" groups="pdk" clone-depth="1"/>
  <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="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"/>
@@ -796,6 +728,7 @@
  <project path="system/ca-certificates" name="platform/system/ca-certificates" groups="pdk"/>
  <project path="system/chre" name="platform/system/chre" groups="pdk"/>
  <project path="system/connectivity/wificond" name="platform/system/connectivity/wificond" groups="pdk"/>
+  <project path="system/connectivity/wifilogd" name="platform/system/connectivity/wifilogd" groups="pdk"/>
  <project path="system/core" name="platform/system/core" groups="pdk"/>
  <project path="system/extras" name="platform/system/extras" groups="pdk"/>
  <project path="system/gatekeeper" name="platform/system/gatekeeper" groups="pdk"/>
@@ -806,20 +739,15 @@
  <project path="system/iorap" name="platform/system/iorap" groups="pdk"/>
  <project path="system/keymaster" name="platform/system/keymaster" groups="pdk"/>
  <project path="system/libartpalette" name="platform/system/libartpalette" groups="pdk"/>
-  <project path="system/libbase" name="platform/system/libbase" groups="pdk" />
  <project path="system/libfmq" name="platform/system/libfmq" groups="pdk"/>
  <project path="system/libhidl" name="platform/system/libhidl" groups="pdk"/>
  <project path="system/libhwbinder" name="platform/system/libhwbinder" groups="pdk"/>
-  <project path="system/libprocinfo" name="platform/system/libprocinfo" groups="pdk" />
  <project path="system/libsysprop" name="platform/system/libsysprop" groups="pdk"/>
  <project path="system/libufdt" name="platform/system/libufdt" groups="pdk"/>
  <project path="system/libvintf" name="platform/system/libvintf" groups="pdk"/>
-  <project path="system/libziparchive" name="platform/system/libziparchive" groups="pdk" />
  <project path="system/linkerconfig" name="platform/system/linkerconfig" groups="pdk"/>
-  <project path="system/logging" name="platform/system/logging" groups="pdk" />
  <project path="system/media" name="platform/system/media" groups="pdk"/>
  <project path="system/memory/libion" name="platform/system/memory/libion" groups="pdk"/>
-  <project path="system/memory/libdmabufheap" name="platform/system/memory/libdmabufheap" groups="pdk" />
  <project path="system/memory/libmeminfo" name="platform/system/memory/libmeminfo" groups="pdk"/>
  <project path="system/memory/libmemtrack" name="platform/system/memory/libmemtrack" groups="pdk"/>
  <project path="system/memory/libmemunreachable" name="platform/system/memory/libmemunreachable" groups="pdk"/>
@@ -838,15 +766,14 @@
  <project path="system/tools/mkbootimg" name="platform/system/tools/mkbootimg" groups="pdk"/>
  <project path="system/tools/sysprop" name="platform/system/tools/sysprop" groups="pdk"/>
  <project path="system/tools/xsdc" name="platform/system/tools/xsdc" groups="pdk"/>
-  <project path="system/unwinding" name="platform/system/unwinding" groups="pdk" />
  <project path="system/update_engine" name="platform/system/update_engine" groups="pdk"/>
  <project path="system/vold" name="platform/system/vold" groups="pdk"/>
  <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/suite_harness" name="platform/test/suite_harness" groups="cts,pdk-cw-fs,pdk-fs"/>
  <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"/>
@@ -859,10 +786,8 @@
  <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"/>
@@ -878,6 +803,7 @@
  <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/loganalysis" name="platform/tools/loganalysis" groups="nopresubmit,pdk,tradefed"/>
  <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"/>
@@ -888,11 +814,9 @@
  <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/tradefederation/core" name="platform/tools/tradefederation" groups="pdk,tradefed"/>
+  <project path="tools/tradefederation/contrib" name="platform/tools/tradefederation/contrib" 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>