Manifest for Android VTS 11.0 Release 3 (7137996)

Change-Id: I285c8b1b7a75aa595440c7a7fb96bbba26211f1b

GLOBAL-PREUPLOAD.cfg

@@ -14,3 +14,4 @@ git-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bi
 gofmt = ${REPO_ROOT}/prebuilts/go/${BUILD_OS}/bin/gofmt
 google-java-format = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format
 google-java-format-diff = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format-diff.py
+cpplint = ${REPO_ROOT}/external/google-styleguide/cpplint/cpplint.py

default.xml

@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
 <manifest>
 
   <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
-  <default remote="aosp" revision="refs/tags/platform-tools-29.0.1" sync-j="4" />
+  <default remote="aosp" revision="refs/tags/android-vts-11.0_r3" sync-j="4" />
 
   <project groups="pdk" name="platform/build" path="build/make">
     <copyfile dest="Makefile" src="core/root.mk" />
@@ -14,7 +13,6 @@
     <linkfile dest="build/tools" src="tools" />
   </project>
   <project groups="pdk,tradefed" name="platform/build/blueprint" path="build/blueprint" />
-  <project groups="pdk,tradefed" name="platform/build/kati" path="build/kati" />
   <project groups="pdk,tradefed" name="platform/build/soong" path="build/soong">
     <linkfile dest="Android.bp" src="root.bp" />
     <linkfile dest="bootstrap.bash" src="bootstrap.bash" />
@@ -25,7 +23,7 @@
   <project groups="pdk" name="platform/compatibility/cdd" path="compatibility/cdd" />
   <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/cts" path="cts" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/dalvik" path="dalvik" />
-  <project groups="developers" name="platform/developers/build" path="developers/build" />
+  <project groups="developers,pdk" name="platform/developers/build" path="developers/build" />
   <project groups="developers" name="platform/developers/demos" path="developers/demos" />
   <project groups="developers" name="platform/developers/samples/android" path="developers/samples/android" />
   <project groups="developers,pdk-cw-fs,pdk-fs" name="platform/development" path="development" />
@@ -34,6 +32,7 @@
   <project groups="pdk-cw-fs,pdk" name="device/common" path="device/common" />
   <project groups="pdk" name="device/generic/arm64" path="device/generic/arm64" />
   <project groups="pdk" name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" />
+  <project groups="pdk" name="device/generic/art" path="device/generic/art" />
   <project groups="pdk" name="device/generic/car" path="device/generic/car" />
   <project groups="pdk" name="device/generic/common" path="device/generic/common" />
   <project groups="pdk" name="device/generic/goldfish" path="device/generic/goldfish" />
@@ -52,39 +51,47 @@
   <project groups="device,bonito" name="device/google/bonito" path="device/google/bonito" />
   <project clone-depth="1" groups="device,bonito" name="device/google/bonito-kernel" path="device/google/bonito-kernel" />
   <project groups="device,bonito" name="device/google/bonito-sepolicy" path="device/google/bonito-sepolicy" />
-  <project groups="device,marlin,pdk" name="device/google/contexthub" path="device/google/contexthub" />
-  <project groups="device,crosshatch" name="device/google/crosshatch" path="device/google/crosshatch" />
-  <project clone-depth="1" groups="device,crosshatch" name="device/google/crosshatch-kernel" path="device/google/crosshatch-kernel" />
-  <project groups="device,crosshatch" name="device/google/crosshatch-sepolicy" path="device/google/crosshatch-sepolicy" />
+  <project groups="device,pdk" name="device/google/contexthub" path="device/google/contexthub" />
+  <project groups="device,coral,generic_fs" name="device/google/coral" path="device/google/coral" />
+  <project clone-depth="1" groups="device,coral,generic_fs" name="device/google/coral-kernel" path="device/google/coral-kernel" />
+  <project groups="device,coral,generic_fs" name="device/google/coral-sepolicy" path="device/google/coral-sepolicy" />
+  <project groups="device,sunfish" name="device/google/sunfish" path="device/google/sunfish" />
+  <project clone-depth="1" groups="device,sunfish" name="device/google/sunfish-kernel" path="device/google/sunfish-kernel" />
+  <project groups="device,sunfish" name="device/google/sunfish-sepolicy" path="device/google/sunfish-sepolicy" />
+  <project groups="device,crosshatch,generic_fs" name="device/google/crosshatch" path="device/google/crosshatch" />
+  <project clone-depth="1" groups="device,crosshatch,generic_fs" name="device/google/crosshatch-kernel" path="device/google/crosshatch-kernel" />
+  <project groups="device,crosshatch,generic_fs" name="device/google/crosshatch-sepolicy" path="device/google/crosshatch-sepolicy" />
   <project groups="device,pdk" name="device/google/cuttlefish" path="device/google/cuttlefish" />
-  <project groups="device,pdk" name="device/google/cuttlefish_common" path="device/google/cuttlefish_common" />
   <project clone-depth="1" groups="device,pdk" name="device/google/cuttlefish_kernel" path="device/google/cuttlefish_kernel" />
   <project clone-depth="1" groups="device,pdk" name="device/google/cuttlefish_vmm" path="device/google/cuttlefish_vmm" />
   <project groups="device" name="device/google/fuchsia" path="device/google/fuchsia" />
-  <project groups="device,marlin,pdk" name="device/google/marlin" path="device/google/marlin" />
-  <project clone-depth="1" groups="device,marlin,pdk" name="device/google/marlin-kernel" path="device/google/marlin-kernel" />
-  <project groups="device,muskie,pdk" name="device/google/muskie" path="device/google/muskie" />
-  <project groups="device,taimen,pdk" name="device/google/taimen" path="device/google/taimen" />
-  <project clone-depth="1" groups="pdk" name="device/google/vrservices" path="device/google/vrservices" />
-  <project groups="device,wahoo,pdk" name="device/google/wahoo" path="device/google/wahoo" />
-  <project clone-depth="1" groups="device,wahoo,pdk" name="device/google/wahoo-kernel" path="device/google/wahoo-kernel" />
+  <project groups="device,generic_fs,muskie" name="device/google/muskie" path="device/google/muskie" />
+  <project groups="device,taimen" name="device/google/taimen" path="device/google/taimen" />
+  <project groups="device,trout,gull" name="device/google/trout" path="device/google/trout" />
+  <project groups="pdk" name="device/google/vrservices" path="device/google/vrservices" />
+  <project groups="device,generic_fs,wahoo" name="device/google/wahoo" path="device/google/wahoo" />
+  <project clone-depth="1" groups="device,generic_fs,wahoo" name="device/google/wahoo-kernel" path="device/google/wahoo-kernel" />
+  <project groups="pdk" name="device/google_car" path="device/google_car" />
   <project name="device/linaro/bootloader/arm-trusted-firmware" path="device/linaro/bootloader/arm-trusted-firmware" />
   <project name="device/linaro/bootloader/edk2" path="device/linaro/bootloader/edk2" />
   <project name="device/linaro/bootloader/OpenPlatformPkg" path="device/linaro/bootloader/OpenPlatformPkg" />
+  <project groups="device,dragonboard,pdk" name="device/linaro/dragonboard" path="device/linaro/dragonboard" />
+  <project clone-depth="1" groups="device,dragonboard,pdk" name="device/linaro/dragonboard-kernel" path="device/linaro/dragonboard-kernel" />
   <project groups="device,hikey,pdk" name="device/linaro/hikey" path="device/linaro/hikey" />
   <project clone-depth="1" groups="device,hikey,pdk" name="device/linaro/hikey-kernel" path="device/linaro/hikey-kernel" />
   <project groups="device,poplar,pdk" name="device/linaro/poplar" path="device/linaro/poplar" />
   <project clone-depth="1" groups="device,poplar,pdk" name="device/linaro/poplar-kernel" path="device/linaro/poplar-kernel" />
+  <project groups="device" name="device/mediatek/wembley-sepolicy" path="device/mediatek/wembley-sepolicy" />
   <project groups="pdk" name="device/sample" path="device/sample" />
   <project groups="device,beagle_x15,pdk" name="device/ti/beagle-x15" path="device/ti/beagle_x15" />
   <project clone-depth="1" groups="device,beagle_x15,pdk" name="device/ti/beagle-x15-kernel" path="device/ti/beagle_x15-kernel" />
-  <project groups="pdk" name="platform/external/ARMComputeLibrary" path="external/ARMComputeLibrary" />
   <project groups="pdk" name="platform/external/aac" path="external/aac" />
   <project groups="pdk" name="platform/external/adeb" path="external/adeb" />
   <project groups="pdk" name="platform/external/adhd" path="external/adhd" />
   <project groups="adt-infra,notdefault,pdk-fs" name="platform/external/adt-infra" path="external/adt-infra" />
   <project groups="pdk" name="platform/external/android-clat" path="external/android-clat" />
   <project groups="pdk" name="platform/external/androidplot" path="external/androidplot" />
+  <project groups="pdk" name="platform/external/angle" path="external/angle" />
   <project groups="pdk" name="platform/external/ant-glob" path="external/ant-glob" />
   <project groups="pdk" name="platform/external/antlr" path="external/antlr" />
   <project groups="pdk" name="platform/external/apache-commons-bcel" path="external/apache-commons-bcel" />
@@ -93,11 +100,12 @@
   <project groups="pdk" name="platform/external/apache-harmony" path="external/apache-harmony" />
   <project groups="pdk" name="platform/external/apache-http" path="external/apache-http" />
   <project groups="pdk" name="platform/external/apache-xml" path="external/apache-xml" />
-  <project groups="pdk" name="platform/external/archive-patcher" path="external/archive-patcher" />
   <project groups="vendor" name="platform/external/arm-neon-tests" path="external/arm-neon-tests" />
   <project groups="pdk" name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" />
+  <project groups="pdk" name="platform/external/arm-trusted-firmware" path="external/arm-trusted-firmware" />
   <project groups="pdk-fs" name="platform/external/autotest" path="external/autotest" />
   <project groups="pdk" name="platform/external/avb" path="external/avb" />
+  <project groups="pdk" name="platform/external/bc" path="external/bc" />
   <project groups="pdk" name="platform/external/bcc" path="external/bcc" />
   <project groups="pdk" name="platform/external/blktrace" path="external/blktrace" />
   <project groups="pdk" name="platform/external/boringssl" path="external/boringssl" />
@@ -109,20 +117,27 @@
   <project groups="pdk" name="platform/external/capstone" path="external/capstone" />
   <project groups="pdk" name="platform/external/catch2" path="external/catch2" />
   <project groups="pdk" name="platform/external/cblas" path="external/cblas" />
+  <project groups="pdk" name="platform/external/cbor-java" path="external/cbor-java" />
   <project groups="pdk" name="platform/external/chromium-libpac" path="external/chromium-libpac" />
   <project groups="pdk" name="platform/external/chromium-trace" path="external/chromium-trace" />
   <project clone-depth="1" groups="pdk" name="platform/external/chromium-webview" path="external/chromium-webview" />
   <project groups="pdk" name="platform/external/clang" path="external/clang" />
   <project groups="pdk" name="platform/external/cldr" path="external/cldr" />
-  <project groups="pdk" name="platform/external/cmockery" path="external/cmockery" />
   <project groups="pdk" name="platform/external/cn-cbor" path="external/cn-cbor" />
   <project groups="pdk" name="platform/external/compiler-rt" path="external/compiler-rt" />
   <project groups="pdk" name="platform/external/conscrypt" path="external/conscrypt" />
+  <project groups="pdk" name="platform/external/cpu_features" path="external/cpu_features" />
+  <project groups="pdk" name="platform/external/cpuinfo" path="external/cpuinfo" />
   <project groups="pdk" name="platform/external/crcalc" path="external/crcalc" />
   <project groups="pdk" name="platform/external/cros/system_api" path="external/cros/system_api" />
+  <project groups="pdk" name="platform/external/crosvm" path="external/crosvm" />
   <project groups="pdk" name="platform/external/curl" path="external/curl" />
   <project groups="pdk" name="platform/external/dagger2" path="external/dagger2" />
   <project groups="pdk-fs" name="platform/external/deqp" path="external/deqp" />
+  <project groups="pdk-fs" name="platform/external/deqp-deps/SPIRV-Headers" path="external/deqp-deps/SPIRV-Headers" />
+  <project groups="pdk-fs" name="platform/external/deqp-deps/SPIRV-Tools" path="external/deqp-deps/SPIRV-Tools" />
+  <project groups="pdk-fs" name="platform/external/deqp-deps/glslang" path="external/deqp-deps/glslang" />
+  <project groups="pdk-fs" name="platform/external/deqp-deps/amber" path="external/deqp-deps/amber" />
   <project groups="pdk" name="platform/external/desugar" path="external/desugar" />
   <project groups="pdk" name="platform/external/dexmaker" path="external/dexmaker" />
   <project groups="pdk" name="platform/external/dlmalloc" path="external/dlmalloc" />
@@ -131,26 +146,31 @@
   <project groups="pdk" name="platform/external/doclava" path="external/doclava" />
   <project groups="pdk" name="platform/external/dokka" path="external/dokka" />
   <project groups="drm_hwcomposer,pdk-fs" name="platform/external/drm_hwcomposer" path="external/drm_hwcomposer" />
-  <project groups="pdk" name="platform/external/droiddriver" path="external/droiddriver" />
   <project groups="pdk" name="platform/external/drrickorang" path="external/drrickorang" />
   <project groups="pdk" name="platform/external/dtc" path="external/dtc" />
+  <project groups="pdk" name="platform/external/dynamic_depth" path="external/dynamic_depth" />
   <project groups="pdk" name="platform/external/e2fsprogs" path="external/e2fsprogs" />
   <project groups="pdk" name="platform/external/easymock" path="external/easymock" />
   <project groups="pdk" name="platform/external/eigen" path="external/eigen" />
   <project groups="pdk" name="platform/external/elfutils" path="external/elfutils" />
   <project groups="pdk" name="platform/external/emma" path="external/emma" />
-  <project groups="pdk" name="platform/external/epid-sdk" path="external/epid-sdk" />
   <project groups="pdk" name="platform/external/error_prone" path="external/error_prone" />
+  <project groups="pdk" name="platform/external/ethtool" path="external/ethtool" />
+  <project groups="pdk" name="platform/external/exoplayer" path="external/exoplayer" />
   <project groups="pdk" name="platform/external/expat" path="external/expat" />
   <project groups="pdk" name="platform/external/f2fs-tools" path="external/f2fs-tools" />
+  <project groups="pdk" name="platform/external/fastrpc" path="external/fastrpc" />
   <project groups="pdk" name="platform/external/fdlibm" path="external/fdlibm" />
   <project groups="pdk" name="platform/external/fec" path="external/fec" />
   <project groups="pdk" name="platform/external/flac" path="external/flac" />
   <project groups="pdk" name="platform/external/flatbuffers" path="external/flatbuffers" />
   <project groups="pdk" name="platform/external/fonttools" path="external/fonttools" />
+  <project groups="pdk" name="platform/external/fmtlib" path="external/fmtlib" />
   <project groups="pdk" name="platform/external/freetype" path="external/freetype" />
   <project groups="pdk" name="platform/external/fsck_msdos" path="external/fsck_msdos" />
   <project groups="pdk" name="platform/external/fsverity-utils" path="external/fsverity-utils" />
+  <project groups="pdk" name="platform/external/FP16" path="external/FP16" />
+  <project groups="pdk" name="platform/external/FXdiv" path="external/FXdiv" />
   <project groups="pdk" name="platform/external/gemmlowp" path="external/gemmlowp" />
   <project groups="pdk" name="platform/external/gflags" path="external/gflags" />
   <project groups="pdk,qcom_msm8x26" name="platform/external/giflib" path="external/giflib" />
@@ -158,10 +178,21 @@
   <project groups="pdk" name="platform/external/golang-protobuf" path="external/golang-protobuf" />
   <project groups="pdk" name="platform/external/google-benchmark" path="external/google-benchmark" />
   <project groups="pdk-fs" name="platform/external/google-breakpad" path="external/google-breakpad" />
+  <project groups="pdk" name="platform/external/google-fonts/arbutus-slab" path="external/google-fonts/arbutus-slab" />
+  <project groups="pdk" name="platform/external/google-fonts/barlow" path="external/google-fonts/barlow" />
+  <project groups="pdk" name="platform/external/google-fonts/karla" path="external/google-fonts/karla" />
+  <project groups="pdk" name="platform/external/google-fonts/lustria" path="external/google-fonts/lustria" />
+  <project groups="pdk" name="platform/external/google-fonts/fraunces" path="external/google-fonts/fraunces" />
+  <project groups="pdk" name="platform/external/google-fonts/big-shoulders-text" path="external/google-fonts/big-shoulders-text" />
+  <project groups="pdk" name="platform/external/google-fonts/arvo" path="external/google-fonts/arvo" />
   <project groups="pdk" name="platform/external/google-fonts/carrois-gothic-sc" path="external/google-fonts/carrois-gothic-sc" />
   <project groups="pdk" name="platform/external/google-fonts/coming-soon" path="external/google-fonts/coming-soon" />
   <project groups="pdk" name="platform/external/google-fonts/cutive-mono" path="external/google-fonts/cutive-mono" />
   <project groups="pdk" name="platform/external/google-fonts/dancing-script" path="external/google-fonts/dancing-script" />
+  <project groups="pdk" name="platform/external/google-fonts/lato" path="external/google-fonts/lato" />
+  <project groups="pdk" name="platform/external/google-fonts/source-sans-pro" path="external/google-fonts/source-sans-pro" />
+  <project groups="pdk" name="platform/external/google-fonts/rubik" path="external/google-fonts/rubik" />
+  <project groups="pdk" name="platform/external/google-fonts/zilla-slab" path="external/google-fonts/zilla-slab" />
   <project groups="pdk" name="platform/external/google-fruit" path="external/google-fruit" />
   <project groups="pdk" name="platform/external/google-styleguide" path="external/google-styleguide" />
   <project groups="pdk" name="platform/external/googletest" path="external/googletest" />
@@ -170,6 +201,7 @@
   <project groups="pdk,tradefed" name="platform/external/grpc-grpc-java" path="external/grpc-grpc-java" />
   <project groups="pdk" name="platform/external/guava" path="external/guava" />
   <project groups="pdk" name="platform/external/guice" path="external/guice" />
+  <project groups="pdk" name="platform/external/gwp_asan" path="external/gwp_asan" />
   <project groups="pdk" name="platform/external/hamcrest" path="external/hamcrest" />
   <project groups="pdk,qcom_msm8x26" name="platform/external/harfbuzz_ng" path="external/harfbuzz_ng" />
   <project groups="pdk" name="platform/external/honggfuzz" path="external/honggfuzz" />
@@ -177,6 +209,7 @@
   <project groups="pdk" name="platform/external/icu" path="external/icu" />
   <project groups="pdk" name="platform/external/igt-gpu-tools" path="external/igt-gpu-tools" />
   <project groups="pdk" name="platform/external/ImageMagick" path="external/ImageMagick" />
+  <project groups="pdk" name="platform/external/image_io" path="external/image_io" />
   <project groups="pdk" name="platform/external/ims" path="external/ims" />
   <project groups="pdk" name="platform/external/iperf3" path="external/iperf3" />
   <project groups="pdk" name="platform/external/iproute2" path="external/iproute2" />
@@ -204,7 +237,9 @@
   <project groups="pdk" name="platform/external/kernel-headers" path="external/kernel-headers" />
   <project groups="pdk" name="platform/external/kmod" path="external/kmod" />
   <project groups="pdk" name="platform/external/kotlinc" path="external/kotlinc" />
+  <project groups="pdk" name="platform/external/kotlinx.coroutines" path="external/kotlinx.coroutines" />
   <project groups="pdk" name="platform/external/ksoap2" path="external/ksoap2" />
+  <project groups="pdk" name="platform/external/libaom" path="external/libaom" />
   <project groups="pdk" name="platform/external/libavc" path="external/libavc" />
   <project groups="pdk" name="platform/external/libbackup" path="external/libbackup" />
   <project groups="pdk" name="platform/external/libbrillo" path="external/libbrillo" />
@@ -217,17 +252,20 @@
   <project groups="pdk" name="platform/external/libdaemon" path="external/libdaemon" />
   <project groups="pdk" name="platform/external/libdivsufsort" path="external/libdivsufsort" />
   <project groups="pdk" name="platform/external/libdrm" path="external/libdrm" />
+  <project groups="pdk" name="platform/external/libepoxy" path="external/libepoxy" />
   <project groups="pdk" name="platform/external/libese" path="external/libese" />
   <project groups="pdk" name="platform/external/libevent" path="external/libevent" />
   <project groups="pdk" name="platform/external/libexif" path="external/libexif" />
   <project groups="pdk" name="platform/external/libffi" path="external/libffi" />
+  <project groups="pdk" name="platform/external/libgav1" path="external/libgav1" />
+  <project groups="pdk" name="platform/external/libfuse" path="external/libfuse" />
   <project groups="pdk" name="platform/external/libgsm" path="external/libgsm" />
   <project groups="pdk" name="platform/external/libhevc" path="external/libhevc" />
+  <project groups="pdk" name="platform/external/libiio" path="external/libiio" />
   <project groups="pdk" name="platform/external/libjpeg-turbo" path="external/libjpeg-turbo" />
   <project groups="pdk" name="platform/external/libkmsxx" path="external/libkmsxx" />
   <project groups="pdk" name="platform/external/libldac" path="external/libldac" />
   <project groups="pdk" name="platform/external/libmpeg2" path="external/libmpeg2" />
-  <project groups="pdk" name="platform/external/libmtp" path="external/libmtp" />
   <project groups="pdk" name="platform/external/libnetfilter_conntrack" path="external/libnetfilter_conntrack" />
   <project groups="pdk" name="platform/external/libnfnetlink" path="external/libnfnetlink" />
   <project groups="pdk" name="platform/external/libnl" path="external/libnl" />
@@ -237,20 +275,19 @@
   <project groups="pdk" name="platform/external/libphonenumber" path="external/libphonenumber" />
   <project groups="pdk" name="platform/external/libpng" path="external/libpng" />
   <project groups="pdk" name="platform/external/libprotobuf-mutator" path="external/libprotobuf-mutator" />
+  <project groups="pdk" name="platform/external/libsrtp2" path="external/libsrtp2" />
   <project groups="pdk" name="platform/external/libtextclassifier" path="external/libtextclassifier" />
   <project groups="pdk" name="platform/external/libunwind" path="external/libunwind" />
   <project groups="pdk" name="platform/external/libunwind_llvm" path="external/libunwind_llvm" />
   <project groups="pdk" name="platform/external/libusb" path="external/libusb" />
-  <project groups="pdk" name="platform/external/libusb-compat" path="external/libusb-compat" />
   <project groups="pdk" name="platform/external/libutf" path="external/libutf" />
   <project groups="pdk" name="platform/external/libvpx" path="external/libvpx" />
   <project groups="pdk" name="platform/external/libvterm" path="external/libvterm" />
   <project groups="pdk" name="platform/external/libxaac" path="external/libxaac" />
-  <project groups="pdk" name="platform/external/libxcam" path="external/libxcam" />
   <project groups="pdk" name="platform/external/libxkbcommon" path="external/libxkbcommon" />
   <project groups="pdk,libxml2" name="platform/external/libxml2" path="external/libxml2" />
   <project groups="pdk,libyuv" name="platform/external/libyuv" path="external/libyuv" />
-  <project groups="vts,pdk" name="platform/external/linux-kselftest" path="external/linux-kselftest" />
+  <project clone-depth="1" groups="vts,pdk" name="platform/external/linux-kselftest" path="external/linux-kselftest" />
   <project groups="pdk" name="platform/external/llvm" path="external/llvm" />
   <project groups="pdk" name="platform/external/lmfit" path="external/lmfit" />
   <project groups="pdk" name="platform/external/lua" path="external/lua" />
@@ -260,7 +297,7 @@
   <project groups="pdk" name="platform/external/markdown" path="external/markdown" />
   <project groups="pdk" name="platform/external/mdnsresponder" path="external/mdnsresponder" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/external/mesa3d" path="external/mesa3d" />
-  <project groups="pdk" name="platform/external/Microsoft-GSL" path="external/Microsoft-GSL" />
+  <project groups="pdk" name="platform/external/mime-support" path="external/mime-support" />
   <project groups="pdk" name="platform/external/minigbm" path="external/minigbm" />
   <project groups="pdk" name="platform/external/minijail" path="external/minijail" />
   <project groups="pdk" name="platform/external/mksh" path="external/mksh" />
@@ -279,9 +316,7 @@
   <project groups="pdk" name="platform/external/nfacct" path="external/nfacct" />
   <project groups="pdk" name="platform/external/nist-pkits" path="external/nist-pkits" />
   <project groups="pdk" name="platform/external/nist-sip" path="external/nist-sip" />
-  <project groups="pdk" name="platform/external/nos/host/android" path="external/nos/host/android" />
   <project groups="pdk" name="platform/external/nos/host/generic" path="external/nos/host/generic" />
-  <project groups="pdk" name="platform/external/nos/test/system-test-harness" path="external/nos/test/system-test-harness" />
   <project groups="pdk" name="platform/external/noto-fonts" path="external/noto-fonts" />
   <project groups="pdk" name="platform/external/oauth" path="external/oauth" />
   <project groups="pdk" name="platform/external/objenesis" path="external/objenesis" />
@@ -289,92 +324,74 @@
   <project groups="pdk" name="platform/external/okhttp" path="external/okhttp" />
   <project groups="pdk" name="platform/external/one-true-awk" path="external/one-true-awk" />
   <project groups="pdk,tradefed" name="platform/external/opencensus-java" path="external/opencensus-java" />
+  <project groups="pdk" name="platform/external/OpenCL-CTS" path="external/OpenCL-CTS" />
+  <project groups="pdk" name="platform/external/OpenCSD" path="external/OpenCSD" />
+  <project groups="pdk" name="platform/external/openssh" path="external/openssh" />
+  <project groups="pdk" name="platform/external/oss-fuzz" path="external/oss-fuzz" />
   <project groups="pdk" name="platform/external/owasp/sanitizer" path="external/owasp/sanitizer" />
   <project groups="pdk" name="platform/external/parameter-framework" path="external/parameter-framework" />
   <project groups="pdk" name="platform/external/pcre" path="external/pcre" />
   <project groups="pdk" name="platform/external/pdfium" path="external/pdfium" />
-  <project groups="pdk" name="platform/external/perf_data_converter" path="external/perf_data_converter" />
   <project groups="pdk" name="platform/external/perfetto" path="external/perfetto" />
   <project groups="pdk" name="platform/external/piex" path="external/piex" />
   <project groups="pdk" name="platform/external/ply" path="external/ply" />
   <project groups="pdk" name="platform/external/ppp" path="external/ppp" />
   <project groups="pdk" name="platform/external/proguard" path="external/proguard" />
   <project groups="pdk" name="platform/external/protobuf" path="external/protobuf" />
-  <project groups="pdk" name="platform/external/protobuf-javalite" path="external/protobuf-javalite" />
+  <project groups="pdk" name="platform/external/psimd" path="external/psimd" />
+  <project groups="pdk" name="platform/external/pthreadpool" path="external/pthreadpool" />
   <project groups="pdk" name="platform/external/puffin" path="external/puffin" />
   <project groups="pdk" name="platform/external/python/apitools" path="external/python/apitools" />
-  <project groups="vts,pdk" name="platform/external/python/appdirs" path="external/python/appdirs" />
   <project groups="pdk" name="platform/external/python/asn1crypto" path="external/python/asn1crypto" />
-  <project groups="pdk" name="platform/external/python/atomicwrites" path="external/python/atomicwrites" />
-  <project groups="pdk" name="platform/external/python/attrs" path="external/python/attrs" />
-  <project groups="vts,pdk" name="platform/external/python/cachetools" path="external/python/cachetools" />
   <project groups="pdk" name="platform/external/python/cffi" path="external/python/cffi" />
   <project groups="pdk" name="platform/external/python/cpython2" path="external/python/cpython2" />
   <project groups="pdk" name="platform/external/python/cpython3" path="external/python/cpython3" />
   <project groups="pdk" name="platform/external/python/cryptography" path="external/python/cryptography" />
   <project groups="pdk" name="platform/external/python/dateutil" path="external/python/dateutil" />
-  <project groups="vts,pdk" name="platform/external/python/dill" path="external/python/dill" />
-  <project groups="vts,pdk" name="platform/external/python/enum" path="external/python/enum" />
   <project groups="vts,pdk" name="platform/external/python/enum34" path="external/python/enum34" />
   <project groups="pdk" name="platform/external/python/funcsigs" path="external/python/funcsigs" />
-  <project groups="vts,pdk" name="platform/external/python/future" path="external/python/future" />
   <project groups="vts,pdk" name="platform/external/python/futures" path="external/python/futures" />
-  <project groups="vts,pdk" name="platform/external/python/gapic-google-cloud-pubsub-v1" path="external/python/gapic-google-cloud-pubsub-v1" />
   <project groups="vts,pdk" name="platform/external/python/google-api-python-client" path="external/python/google-api-python-client" />
-  <project groups="vts,pdk" name="platform/external/python/google-auth" path="external/python/google-auth" />
-  <project groups="vts,pdk" name="platform/external/python/google-auth-httplib2" path="external/python/google-auth-httplib2" />
-  <project groups="vts,pdk" name="platform/external/python/google-cloud-core" path="external/python/google-cloud-core" />
-  <project groups="vts,pdk" name="platform/external/python/google-cloud-pubsub" path="external/python/google-cloud-pubsub" />
-  <project groups="vts,pdk" name="platform/external/python/google-gax" path="external/python/google-gax" />
-  <project groups="vts,pdk" name="platform/external/python/googleapis" path="external/python/googleapis" />
-  <project groups="vts,pdk" name="platform/external/python/grpc-google-iam-v1" path="external/python/grpc-google-iam-v1" />
-  <project groups="vts,pdk" name="platform/external/python/grpcio" path="external/python/grpcio" />
   <project groups="vts,pdk" name="platform/external/python/httplib2" path="external/python/httplib2" />
   <project groups="pdk" name="platform/external/python/ipaddress" path="external/python/ipaddress" />
-  <project groups="vts,pdk" name="platform/external/python/matplotlib" path="external/python/matplotlib" />
   <project groups="pdk" name="platform/external/python/mock" path="external/python/mock" />
-  <project groups="pdk" name="platform/external/python/more-itertools" path="external/python/more-itertools" />
-  <project groups="vts,pdk" name="platform/external/python/numpy" path="external/python/numpy" />
   <project groups="vts,pdk" name="platform/external/python/oauth2client" path="external/python/oauth2client" />
-  <project groups="vts,pdk" name="platform/external/python/olefile" path="external/python/olefile" />
-  <project groups="vts,pdk" name="platform/external/python/packaging" path="external/python/packaging" />
-  <project groups="vts,pdk" name="platform/external/python/parse" path="external/python/parse" />
-  <project groups="vts,pdk" name="platform/external/python/Pillow" path="external/python/Pillow" />
-  <project groups="vts,pdk" name="platform/external/python/ply" path="external/python/ply" />
-  <project groups="pdk" name="platform/external/python/pluggy" path="external/python/pluggy" />
-  <project groups="vts,pdk" name="platform/external/python/proto-google-cloud-pubsub-v1" path="external/python/proto-google-cloud-pubsub-v1" />
-  <project groups="vts,pdk" name="platform/external/python/protobuf" path="external/python/protobuf" />
-  <project groups="pdk" name="platform/external/python/py" path="external/python/py" />
+  <project groups="vts,pdk" name="platform/external/python/parse_type" path="external/python/parse_type" />
   <project groups="vts,pdk" name="platform/external/python/pyasn1" path="external/python/pyasn1" />
   <project groups="vts,pdk" name="platform/external/python/pyasn1-modules" path="external/python/pyasn1-modules" />
+  <project groups="pdk" name="platform/external/python/pybind11" path="external/python/pybind11" />
   <project groups="pdk" name="platform/external/python/pycparser" path="external/python/pycparser" />
   <project groups="pdk" name="platform/external/python/pyopenssl" path="external/python/pyopenssl" />
-  <project groups="vts,pdk" name="platform/external/python/pyparsing" path="external/python/pyparsing" />
-  <project groups="pdk" name="platform/external/python/pytest" path="external/python/pytest" />
-  <project groups="vts,pdk" name="platform/external/python/requests" path="external/python/requests" />
   <project groups="vts,pdk" name="platform/external/python/rsa" path="external/python/rsa" />
-  <project groups="vts,pdk" name="platform/external/python/scipy" path="external/python/scipy" />
   <project groups="vts,pdk" name="platform/external/python/setuptools" path="external/python/setuptools" />
   <project groups="vts,pdk" name="platform/external/python/six" path="external/python/six" />
   <project groups="vts,pdk" name="platform/external/python/uritemplates" path="external/python/uritemplates" />
-  <project groups="pdk" name="platform/external/rapidjson" path="external/rapidjson" />
   <project groups="pdk" name="platform/external/rappor" path="external/rappor" />
   <project groups="pdk" name="platform/external/replicaisland" path="external/replicaisland" />
   <project groups="pdk" name="platform/external/rmi4utils" path="external/rmi4utils" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/robolectric" path="external/robolectric" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/external/robolectric-shadows" path="external/robolectric-shadows" />
   <project groups="pdk" name="platform/external/roboto-fonts" path="external/roboto-fonts" />
   <project groups="pdk" name="platform/external/rootdev" path="external/rootdev" />
   <project groups="pdk" name="platform/external/Reactive-Extensions/RxCpp" path="external/Reactive-Extensions/RxCpp" />
+  <project groups="pdk" name="platform/external/rust/crates/byteorder" path="external/rust/crates/byteorder" />
+  <project groups="pdk" name="platform/external/rust/crates/libc" path="external/rust/crates/libc" />
+  <project groups="pdk" name="platform/external/rust/crates/proc-macro2" path="external/rust/crates/proc-macro2" />
+  <project groups="pdk" name="platform/external/rust/crates/quote" path="external/rust/crates/quote" />
+  <project groups="pdk" name="platform/external/rust/crates/remain" path="external/rust/crates/remain" />
+  <project groups="pdk" name="platform/external/rust/crates/syn" path="external/rust/crates/syn" />
+  <project groups="pdk" name="platform/external/rust/crates/unicode-xid" path="external/rust/crates/unicode-xid" />
   <project groups="pdk-fs" name="platform/external/scapy" path="external/scapy" />
   <project groups="pdk" name="platform/external/scrypt" path="external/scrypt" />
+  <project groups="pdk" name="platform/external/scudo" path="external/scudo" />
   <project groups="pdk" name="platform/external/seccomp-tests" path="external/seccomp-tests" />
   <project groups="pdk" name="platform/external/selinux" path="external/selinux" />
+  <project groups="pdk" name="platform/external/setupcompat" path="external/setupcompat" />
+  <project groups="pdk" name="platform/external/setupdesign" path="external/setupdesign" />
   <project groups="pdk,qcom_msm8x26" name="platform/external/sfntly" path="external/sfntly" />
   <project groups="pdk" name="platform/external/shaderc/spirv-headers" path="external/shaderc/spirv-headers" />
   <project groups="pdk" name="platform/external/shflags" path="external/shflags" />
   <project groups="pdk,qcom_msm8x26" name="platform/external/skia" path="external/skia" />
-  <project clone-depth="1" groups="cts" name="platform/external/skqp" path="external/skqp" />
+  <project clone-depth="1" groups="cts,pdk" name="platform/external/skqp" path="external/skqp" />
   <project groups="pdk" name="platform/external/sl4a" path="external/sl4a" />
   <project groups="pdk" name="platform/external/slf4j" path="external/slf4j" />
   <project groups="pdk" name="platform/external/smali" path="external/smali" />
@@ -386,8 +403,8 @@
   <project groups="pdk" name="platform/external/squashfs-tools" path="external/squashfs-tools" />
   <project groups="pdk" name="platform/external/strace" path="external/strace" />
   <project groups="pdk" name="platform/external/stressapptest" path="external/stressapptest" />
+  <project clone-depth="1" groups="pdk" name="platform/external/subsampling-scale-image-view" path="external/subsampling-scale-image-view" />
   <project groups="pdk" name="platform/external/swiftshader" path="external/swiftshader" />
-  <project groups="projectarch,pdk" name="platform/external/syzkaller" path="external/syzkaller" />
   <project groups="pdk" name="platform/external/tagsoup" path="external/tagsoup" />
   <project groups="pdk" name="platform/external/tcpdump" path="external/tcpdump" />
   <project groups="pdk" name="platform/external/tensorflow" path="external/tensorflow" />
@@ -423,6 +440,7 @@
   <project groups="pdk" name="platform/external/xmp_toolkit" path="external/xmp_toolkit" />
   <project groups="pdk" name="platform/external/xz-embedded" path="external/xz-embedded" />
   <project groups="pdk" name="platform/external/xz-java" path="external/xz-java" />
+  <project groups="pdk" name="platform/external/XNNPACK" path="external/XNNPACK" />
   <project groups="vts,projectarch,pdk" name="platform/external/yapf" path="external/yapf" />
   <project groups="pdk" name="platform/external/zlib" path="external/zlib" />
   <project groups="pdk" name="platform/external/zopfli" path="external/zopfli" />
@@ -435,6 +453,10 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/ex" path="frameworks/ex" />
   <project groups="pdk" name="platform/frameworks/hardware/interfaces" path="frameworks/hardware/interfaces" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/layoutlib" path="frameworks/layoutlib" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/libs/systemui" path="frameworks/libs/systemui" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/libs/modules-utils" path="frameworks/libs/modules-utils" />
+  <project groups="pdk" name="platform/frameworks/libs/native_bridge_support" path="frameworks/libs/native_bridge_support" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/libs/net" path="frameworks/libs/net" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/minikin" path="frameworks/minikin" />
   <project groups="pdk" name="platform/frameworks/ml" path="frameworks/ml" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/multidex" path="frameworks/multidex" />
@@ -445,11 +467,8 @@
   <project groups="pdk" name="platform/frameworks/opt/car/setupwizard" path="frameworks/opt/car/setupwizard" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/chips" path="frameworks/opt/chips" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/colorpicker" path="frameworks/opt/colorpicker" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/datetimepicker" path="frameworks/opt/datetimepicker" />
-  <project name="platform/frameworks/opt/gamesdk" path="frameworks/opt/gamesdk" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/inputmethodcommon" path="frameworks/opt/inputmethodcommon" />
+  <project name="platform/frameworks/opt/localepicker" path="frameworks/opt/localepicker" />
   <project groups="pdk-fs" name="platform/frameworks/opt/net/ethernet" path="frameworks/opt/net/ethernet" />
-  <project groups="pdk" name="platform/frameworks/opt/net/ike" path="frameworks/opt/net/ike" />
   <project groups="frameworks_ims,pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/ims" path="frameworks/opt/net/ims" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/voip" path="frameworks/opt/net/voip" />
   <project groups="pdk" name="platform/frameworks/opt/net/wifi" path="frameworks/opt/net/wifi" />
@@ -457,19 +476,22 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/setupwizard" path="frameworks/opt/setupwizard" />
   <project groups="pdk" name="platform/frameworks/opt/telephony" path="frameworks/opt/telephony" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/timezonepicker" path="frameworks/opt/timezonepicker" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/tv/tvsystem" path="frameworks/opt/tv/tvsystem" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/vcard" path="frameworks/opt/vcard" />
   <project groups="pdk" name="platform/frameworks/rs" path="frameworks/rs" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/support" path="frameworks/support" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/wilhelm" path="frameworks/wilhelm" />
   <project groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" />
   <project groups="pdk,broadcom_wlan" name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" />
   <project groups="pdk" name="platform/hardware/google/apf" path="hardware/google/apf" />
   <project groups="pdk" name="platform/hardware/google/av" path="hardware/google/av" />
+  <project groups="pdk" name="platform/hardware/google/camera" path="hardware/google/camera" />
   <project groups="pdk,easel" name="platform/hardware/google/easel" path="hardware/google/easel" />
   <project groups="pdk" name="platform/hardware/google/interfaces" path="hardware/google/interfaces" />
-  <project groups="bonito,crosshatch" name="platform/hardware/google/pixel" path="hardware/google/pixel" />
+  <project groups="generic_fs,pixel" name="platform/hardware/google/pixel" path="hardware/google/pixel" />
+  <project groups="generic_fs,pixel" name="platform/hardware/google/pixel-sepolicy" path="hardware/google/pixel-sepolicy" />
   <project groups="pdk" name="platform/hardware/interfaces" path="hardware/interfaces" />
   <project groups="invensense,pdk" name="platform/hardware/invensense" path="hardware/invensense" />
+  <project groups="coral,generic_fs" name="platform/hardware/knowles/athletico/sound_trigger_hal" path="hardware/knowles/athletico/sound_trigger_hal" />
   <project groups="pdk" name="platform/hardware/libhardware" path="hardware/libhardware" />
   <project groups="pdk" name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" />
   <project groups="pdk" name="platform/hardware/nxp/nfc" path="hardware/nxp/nfc" />
@@ -493,25 +515,33 @@
   <project groups="qcom_msm8x84,pdk-qcom" name="platform/hardware/qcom/msm8x84" path="hardware/qcom/msm8x84" />
   <project groups="wahoo" name="platform/hardware/qcom/neuralnetworks/hvxservice" path="hardware/qcom/neuralnetworks/hvxservice" />
   <project groups="qcom,pdk-qcom" name="platform/hardware/qcom/power" path="hardware/qcom/power" />
-  <project groups="vendor,qcom_sdm710" name="platform/hardware/qcom/sdm710/data/ipacfg-mgr" path="hardware/qcom/sdm710/data/ipacfg-mgr" />
-  <project groups="qcom_sdm710" name="platform/hardware/qcom/sdm710/display" path="hardware/qcom/sdm710/display">
-    <linkfile dest="hardware/qcom/sdm710/Android.mk" src="os_pickup.mk" />
-    <linkfile dest="hardware/qcom/sdm710/Android.bp" src="os_pickup.bp" />
-  </project>
-  <project groups="qcom_sdm710" name="platform/hardware/qcom/sdm710/gps" path="hardware/qcom/sdm710/gps" />
-  <project groups="qcom_sdm710" name="platform/hardware/qcom/sdm710/media" path="hardware/qcom/sdm710/media" />
-  <project groups="qcom_sdm710" name="platform/hardware/qcom/sdm710/thermal" path="hardware/qcom/sdm710/thermal" />
-  <project groups="qcom_sdm710" name="platform/hardware/qcom/sdm710/vr" path="hardware/qcom/sdm710/vr" />
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/bt" path="hardware/qcom/sdm845/bt" />
-  <project groups="vendor,qcom_sdm845" name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" path="hardware/qcom/sdm845/data/ipacfg-mgr">
+  <project groups="generic_fs,qcom_sdm845" name="platform/hardware/qcom/sdm845/bt" path="hardware/qcom/sdm845/bt" />
+  <project groups="generic_fs,vendor,qcom_sdm845" name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" path="hardware/qcom/sdm845/data/ipacfg-mgr">
     <linkfile dest="hardware/qcom/sdm845/Android.mk" src="os_pickup.mk" />
     <linkfile dest="hardware/qcom/sdm845/Android.bp" src="os_pickup.bp" />
   </project>
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/display" path="hardware/qcom/sdm845/display" />
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/gps" path="hardware/qcom/sdm845/gps" />
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/media" path="hardware/qcom/sdm845/media" />
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/thermal" path="hardware/qcom/sdm845/thermal" />
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/vr" path="hardware/qcom/sdm845/vr" />
+  <project groups="generic_fs,qcom_sdm845" name="platform/hardware/qcom/sdm845/display" path="hardware/qcom/sdm845/display" />
+  <project groups="generic_fs,qcom_sdm845" name="platform/hardware/qcom/sdm845/gps" path="hardware/qcom/sdm845/gps" />
+  <project groups="generic_fs,qcom_sdm845" name="platform/hardware/qcom/sdm845/media" path="hardware/qcom/sdm845/media" />
+  <project groups="generic_fs,qcom_sdm845" name="platform/hardware/qcom/sdm845/thermal" path="hardware/qcom/sdm845/thermal" />
+  <project groups="generic_fs,qcom_sdm845" name="platform/hardware/qcom/sdm845/vr" path="hardware/qcom/sdm845/vr" />
+  <project groups="qcom_sm7150" name="platform/hardware/qcom/sm7150/gps" path="hardware/qcom/sm7150/gps">
+    <linkfile dest="hardware/qcom/sm7150/Android.mk" src="os_pickup.mk" />
+    <linkfile dest="hardware/qcom/sm7150/Android.bp" src="os_pickup.bp" />
+  </project>
+  <project groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/data/ipacfg-mgr" path="hardware/qcom/sm8150/data/ipacfg-mgr">
+    <linkfile dest="hardware/qcom/sm8150/Android.mk" src="os_pickup.mk" />
+    <linkfile dest="hardware/qcom/sm8150/Android.bp" src="os_pickup.bp" />
+  </project>
+  <project groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/display" path="hardware/qcom/sm8150/display" />
+  <project groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/gps" path="hardware/qcom/sm8150/gps" />
+  <project groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/media" path="hardware/qcom/sm8150/media" />
+  <project groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/thermal" path="hardware/qcom/sm8150/thermal" />
+  <project groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/vr" path="hardware/qcom/sm8150/vr" />
+  <project groups="qcom_sm8150p" name="platform/hardware/qcom/sm8150p/gps" path="hardware/qcom/sm8150p/gps">
+    <linkfile dest="hardware/qcom/sm8150p/Android.mk" src="os_pickup.mk" />
+    <linkfile dest="hardware/qcom/sm8150p/Android.bp" src="os_pickup.bp" />
+  </project>
   <project groups="qcom_wlan,pdk-qcom" name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" />
   <project groups="pdk" name="platform/hardware/ril" path="hardware/ril" />
   <project groups="pdk" name="platform/hardware/st/nfc" path="hardware/st/nfc" />
@@ -519,7 +549,8 @@
   <project groups="pdk" name="platform/hardware/ti/am57x" path="hardware/ti/am57x" />
   <project name="kernel/build" path="kernel/build" />
   <project groups="vts,pdk" name="kernel/configs" path="kernel/configs" />
-  <project name="kernel/tests" path="kernel/tests" />
+  <project clone-depth="1" groups="pdk" name="kernel/prebuilts/4.19/arm64" path="kernel/prebuilts/4.19/arm64" />
+  <project groups="vts,pdk" name="kernel/tests" path="kernel/tests" />
   <project groups="pdk" name="platform/libcore" path="libcore" />
   <project groups="pdk" name="platform/libnativehelper" path="libnativehelper" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/BasicSmsReceiver" path="packages/apps/BasicSmsReceiver" />
@@ -527,21 +558,24 @@
   <project groups="pdk-fs" name="platform/packages/apps/Browser2" path="packages/apps/Browser2" />
   <project groups="pdk-fs" name="platform/packages/apps/Calendar" path="packages/apps/Calendar" />
   <project groups="pdk-fs" name="platform/packages/apps/Camera2" path="packages/apps/Camera2" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/Calendar" path="packages/apps/Car/Calendar" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/Cluster" path="packages/apps/Car/Cluster" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/CompanionDeviceSupport" path="packages/apps/Car/CompanionDeviceSupport" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Dialer" path="packages/apps/Car/Dialer" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Hvac" path="packages/apps/Car/Hvac" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/LatinIME" path="packages/apps/Car/LatinIME" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Launcher" path="packages/apps/Car/Launcher" />
-  <project groups="pdk-fs" name="platform/packages/apps/Car/LensPicker" path="packages/apps/Car/LensPicker" />
-  <project groups="pdk-fs" name="platform/packages/apps/Car/libs" path="packages/apps/Car/libs" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/LinkViewer" path="packages/apps/Car/LinkViewer" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/LocalMediaPlayer" path="packages/apps/Car/LocalMediaPlayer" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Media" path="packages/apps/Car/Media" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Messenger" path="packages/apps/Car/Messenger" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Notification" path="packages/apps/Car/Notification" />
-  <project groups="pdk-fs" name="platform/packages/apps/Car/Overview" path="packages/apps/Car/Overview" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Radio" path="packages/apps/Car/Radio" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/RotaryController" path="packages/apps/Car/RotaryController" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Settings" path="packages/apps/Car/Settings" />
-  <project groups="pdk-fs" name="platform/packages/apps/Car/Stream" path="packages/apps/Car/Stream" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/SystemUpdater" path="packages/apps/Car/SystemUpdater" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/libs" path="packages/apps/Car/libs" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/tests" path="packages/apps/Car/tests" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CarrierConfig" path="packages/apps/CarrierConfig" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" />
@@ -550,13 +584,11 @@
   <project groups="pdk" name="platform/packages/apps/DevCamera" path="packages/apps/DevCamera" />
   <project groups="pdk-fs" name="platform/packages/apps/Dialer" path="packages/apps/Dialer" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/DocumentsUI" path="packages/apps/DocumentsUI" />
-  <project groups="pdk-fs" name="platform/packages/apps/Email" path="packages/apps/Email" />
   <project groups="pdk-fs" name="platform/packages/apps/EmergencyInfo" path="packages/apps/EmergencyInfo" />
   <project groups="pdk-fs" name="platform/packages/apps/Gallery" path="packages/apps/Gallery" />
   <project groups="pdk-fs" name="platform/packages/apps/Gallery2" path="packages/apps/Gallery2" />
   <project groups="pdk-fs" name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" />
   <project groups="pdk-fs" name="platform/packages/apps/KeyChain" path="packages/apps/KeyChain" />
-  <project groups="pdk-fs" name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" />
   <project groups="pdk-fs" name="platform/packages/apps/Launcher3" path="packages/apps/Launcher3" />
   <project groups="pdk-fs" name="platform/packages/apps/LegacyCamera" path="packages/apps/LegacyCamera" />
   <project groups="pdk-fs" name="platform/packages/apps/ManagedProvisioning" path="packages/apps/ManagedProvisioning" />
@@ -564,13 +596,16 @@
   <project groups="pdk-fs" name="platform/packages/apps/Music" path="packages/apps/Music" />
   <project groups="pdk-fs" name="platform/packages/apps/MusicFX" path="packages/apps/MusicFX" />
   <project groups="apps_nfc,pdk-fs" name="platform/packages/apps/Nfc" path="packages/apps/Nfc" />
+  <project groups="pdk-fs" name="platform/packages/apps/OnDeviceAppPrediction" path="packages/apps/OnDeviceAppPrediction" />
   <project groups="pdk-fs" name="platform/packages/apps/OneTimeInitializer" path="packages/apps/OneTimeInitializer" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PermissionController" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PhoneCommon" path="packages/apps/PhoneCommon" />
   <project groups="pdk-fs" name="platform/packages/apps/Protips" path="packages/apps/Protips" />
   <project groups="pdk-fs" name="platform/packages/apps/Provision" path="packages/apps/Provision" />
   <project groups="pdk-fs" name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" />
+  <project groups="pdk-fs" name="platform/packages/apps/QuickAccessWallet" path="packages/apps/QuickAccessWallet" />
   <project groups="pdk-fs" name="platform/packages/apps/SafetyRegulatoryInfo" path="packages/apps/SafetyRegulatoryInfo" />
+  <project groups="pdk-fs" name="platform/packages/apps/SampleLocationAttribution" path="packages/apps/SampleLocationAttribution" />
   <project groups="apps_se,pdk-fs" name="platform/packages/apps/SecureElement" path="packages/apps/SecureElement" />
   <project groups="pdk-fs" name="platform/packages/apps/Settings" path="packages/apps/Settings" />
   <project groups="pdk-fs" name="platform/packages/apps/SettingsIntelligence" path="packages/apps/SettingsIntelligence" />
@@ -583,14 +618,28 @@
   <project groups="pdk" name="platform/packages/apps/Test/connectivity" path="packages/apps/Test/connectivity" />
   <project groups="pdk" name="platform/packages/apps/TimeZoneData" path="packages/apps/TimeZoneData" />
   <project groups="pdk" name="platform/packages/apps/TimeZoneUpdater" path="packages/apps/TimeZoneUpdater" />
+  <project groups="pdk-fs" name="platform/packages/apps/ThemePicker" path="packages/apps/ThemePicker" />
   <project groups="pdk-fs" name="platform/packages/apps/Traceur" path="packages/apps/Traceur" />
   <project groups="pdk-fs" name="platform/packages/apps/TvSettings" path="packages/apps/TvSettings" />
-  <project name="platform/packages/apps/TV" path="packages/apps/TV" />
-  <project groups="pdk-fs" name="platform/packages/apps/UnifiedEmail" path="packages/apps/UnifiedEmail" />
+  <project groups="pdk" name="platform/packages/apps/TV" path="packages/apps/TV" />
+  <project name="platform/packages/apps/UniversalMediaPlayer" path="packages/apps/UniversalMediaPlayer" />
   <project groups="pdk-fs" name="platform/packages/apps/WallpaperPicker" path="packages/apps/WallpaperPicker" />
+  <project groups="pdk-fs" name="platform/packages/apps/WallpaperPicker2" path="packages/apps/WallpaperPicker2" />
   <project groups="pdk-fs" name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" />
+  <project groups="pdk-fs" name="platform/packages/inputmethods/LeanbackIME" path="packages/inputmethods/LeanbackIME" />
+  <project clone-depth="1" groups="pdk" name="platform/packages/modules/ArtPrebuilt" path="packages/modules/ArtPrebuilt" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/CaptivePortalLogin" path="packages/modules/CaptivePortalLogin" />
+  <project groups="pdk" name="platform/packages/modules/CellBroadcastService" path="packages/modules/CellBroadcastService" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/Cronet" path="packages/modules/Cronet" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/DnsResolver" path="packages/modules/DnsResolver" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/ExtServices" path="packages/modules/ExtServices" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/IPsec" path="packages/modules/IPsec" />
   <project groups="pdk" name="platform/packages/modules/ModuleMetadata" path="packages/modules/ModuleMetadata" />
-  <project groups="pdk-fs" name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/NetworkPermissionConfig" path="packages/modules/NetworkPermissionConfig" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/NetworkStack" path="packages/modules/NetworkStack" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/SdkExtensions" path="packages/modules/SdkExtensions" />
+  <project name="platform/packages/modules/TestModule" path="packages/modules/TestModule" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/vndk" path="packages/modules/vndk" />
   <project groups="pdk-fs" name="platform/packages/providers/BlockedNumberProvider" path="packages/providers/BlockedNumberProvider" />
   <project groups="pdk-fs" name="platform/packages/providers/BookmarkProvider" path="packages/providers/BookmarkProvider" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" />
@@ -604,14 +653,14 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" />
   <project groups="pdk-fs" name="platform/packages/screensavers/Basic" path="packages/screensavers/Basic" />
   <project groups="pdk-fs" name="platform/packages/screensavers/PhotoTable" path="packages/screensavers/PhotoTable" />
-  <project groups="pdk-fs" name="platform/packages/screensavers/WebView" path="packages/screensavers/WebView" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/BuiltInPrintService" path="packages/services/BuiltInPrintService" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/AlternativeNetworkAccess" path="packages/services/AlternativeNetworkAccess" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Car" path="packages/services/Car" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Mms" path="packages/services/Mms" />
-  <project groups="pdk-fs" name="platform/packages/services/NetworkRecommendation" path="packages/services/NetworkRecommendation" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Mtp" path="packages/services/Mtp" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telecomm" path="packages/services/Telecomm" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telephony" path="packages/services/Telephony" />
+  <project groups="pdk-fs" name="platform/packages/wallpapers/ImageWallpaper" path="packages/wallpapers/ImageWallpaper" />
   <project groups="pdk-fs" name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" />
   <project groups="pdk" name="platform/pdk" path="pdk" />
   <project groups="pdk-fs,pdk-cw-fs,cts" name="platform/platform_testing" path="platform_testing" />
@@ -627,7 +676,7 @@
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" />
   <project clone-depth="1" groups="pdk,darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" />
-  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/deqp" path="prebuilts/deqp" />
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/cmdline-tools" path="prebuilts/cmdline-tools" />
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/devtools" path="prebuilts/devtools" />
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/fuchsia_sdk" path="prebuilts/fuchsia_sdk" />
   <project clone-depth="1" groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" />
@@ -645,27 +694,33 @@
   <project clone-depth="1" groups="linux,pdk" name="platform/prebuilts/gdb/linux-x86" path="prebuilts/gdb/linux-x86" />
   <project clone-depth="1" groups="darwin,pdk,tradefed" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" />
   <project clone-depth="1" groups="linux,pdk,tradefed" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" />
-  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" />
+  <project clone-depth="1" groups="pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/manifest-merger" path="prebuilts/manifest-merger" />
   <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/android" path="prebuilts/maven_repo/android" />
   <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/bumptech" path="prebuilts/maven_repo/bumptech" />
-  <project clone-depth="1" name="platform/prebuilts/maven_repo/google-play-service-client-libraries-3p" path="prebuilts/maven_repo/google-play-service-client-libraries-3p" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/misc" path="prebuilts/misc" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/module_sdk/art" path="prebuilts/module_sdk/art" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" />
-  <project clone-depth="1" name="platform/prebuilts/ktlint" path="prebuilts/ktlint" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/ktlint" path="prebuilts/ktlint" />
   <project clone-depth="1" groups="darwin,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" />
   <project clone-depth="1" groups="linux,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/runtime" path="prebuilts/runtime" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/rust" path="prebuilts/rust" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/r8" path="prebuilts/r8" />
-  <project clone-depth="1" groups="pdk" name="platform/prebuilts/sdk" path="prebuilts/sdk" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/sdk" path="prebuilts/sdk">
+    <linkfile dest="frameworks/support.md" src="current/androidx-README.md" />
+  </project>
   <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/vndk/v27" path="prebuilts/vndk/v27" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/vndk/v28" path="prebuilts/vndk/v28" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/vndk/v29" path="prebuilts/vndk/v29" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/sdk" path="sdk" />
   <project groups="pdk" name="platform/system/apex" path="system/apex" />
-  <project groups="pdk" name="platform/system/ashmemd" path="system/ashmemd" />
   <project groups="pdk" name="platform/system/bt" path="system/bt" />
   <project groups="pdk" name="platform/system/bpf" path="system/bpf" />
   <project groups="pdk" name="platform/system/bpfprogs" path="system/bpfprogs" />
@@ -679,9 +734,10 @@
   <project groups="pdk" name="platform/system/gsid" path="system/gsid" />
   <project groups="pdk" name="platform/system/hardware/interfaces" path="system/hardware/interfaces" />
   <project groups="pdk" name="platform/system/hwservicemanager" path="system/hwservicemanager" />
+  <project groups="pdk" name="platform/system/incremental_delivery" path="system/incremental_delivery" />
   <project groups="pdk" name="platform/system/iorap" path="system/iorap" />
-  <project groups="pdk" name="platform/system/iot/attestation" path="system/iot/attestation" />
   <project groups="pdk" name="platform/system/keymaster" path="system/keymaster" />
+  <project groups="pdk" name="platform/system/libartpalette" path="system/libartpalette" />
   <project groups="pdk" name="platform/system/libfmq" path="system/libfmq" />
   <project groups="pdk" name="platform/system/libhidl" path="system/libhidl" />
   <project groups="pdk" name="platform/system/libhwbinder" path="system/libhwbinder" />
@@ -690,27 +746,33 @@
   <project groups="pdk" name="platform/system/libvintf" path="system/libvintf" />
   <project groups="pdk" name="platform/system/linkerconfig" path="system/linkerconfig" />
   <project groups="pdk" name="platform/system/media" path="system/media" />
+  <project groups="pdk" name="platform/system/memory/libion" path="system/memory/libion" />
+  <project groups="pdk" name="platform/system/memory/libmeminfo" path="system/memory/libmeminfo" />
+  <project groups="pdk" name="platform/system/memory/libmemtrack" path="system/memory/libmemtrack" />
+  <project groups="pdk" name="platform/system/memory/libmemunreachable" path="system/memory/libmemunreachable" />
+  <project groups="pdk" name="platform/system/memory/lmkd" path="system/memory/lmkd" />
   <project groups="pdk" name="platform/system/netd" path="system/netd" />
   <project groups="pdk" name="platform/system/nfc" path="system/nfc" />
   <project groups="pdk" name="platform/system/nvram" path="system/nvram" />
   <project groups="pdk" name="platform/system/security" path="system/security" />
   <project groups="pdk" name="platform/system/sepolicy" path="system/sepolicy" />
   <project groups="pdk" name="platform/system/server_configurable_flags" path="system/server_configurable_flags" />
+  <project groups="pdk" name="platform/system/teeui" path="system/teeui" />
   <project groups="pdk" name="platform/system/testing/gtest_extras" path="system/testing/gtest_extras" />
   <project groups="pdk" name="platform/system/timezone" path="system/timezone" />
   <project groups="pdk" name="platform/system/tools/aidl" path="system/tools/aidl" />
   <project groups="pdk" name="platform/system/tools/hidl" path="system/tools/hidl" />
+  <project groups="pdk" name="platform/system/tools/mkbootimg" path="system/tools/mkbootimg" />
   <project groups="pdk" name="platform/system/tools/sysprop" path="system/tools/sysprop" />
   <project groups="pdk" name="platform/system/tools/xsdc" path="system/tools/xsdc" />
   <project groups="pdk" name="platform/system/update_engine" path="system/update_engine" />
-  <project groups="pdk" name="platform/system/ucontainer" path="system/ucontainer" />
   <project groups="pdk" name="platform/system/vold" path="system/vold" />
   <project groups="vts,projectarch,pdk" name="platform/test/framework" path="test/framework" />
   <project groups="pdk" name="platform/test/mlts/benchmark" path="test/mlts/benchmark" />
   <project groups="pdk" name="platform/test/mlts/models" path="test/mlts/models" />
+  <project name="platform/test/app_compat/csuite" path="test/app_compat/csuite" />
   <project name="platform/test/mts" path="test/mts" />
   <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/test/suite_harness" path="test/suite_harness" />
-  <project groups="vts,projectarch,pdk" name="platform/test/vti/alert" path="test/vti/alert" />
   <project groups="vts,projectarch,pdk" name="platform/test/vti/dashboard" path="test/vti/dashboard" />
   <project groups="vts,projectarch,pdk" name="platform/test/vti/fuzz_test_serving" path="test/vti/fuzz_test_serving" />
   <project groups="vts,projectarch,pdk" name="platform/test/vti/test_serving" path="test/vti/test_serving" />
@@ -727,20 +789,23 @@
   <project groups="pdk" name="toolchain/pgo-profiles" path="toolchain/pgo-profiles" />
   <project groups="tools,vts,projectarch,pdk,tradefed" name="platform/tools/acloud" path="tools/acloud" />
   <project groups="notdefault,tools" name="platform/tools/adt/idea" path="tools/adt/idea" />
+  <project groups="pdk,tools" name="platform/tools/apifinder" path="tools/apifinder" />
   <project groups="pdk,tradefed" name="platform/tools/apksig" path="tools/apksig" />
   <project groups="pdk,tradefed" name="platform/tools/apkzlib" path="tools/apkzlib" />
   <project groups="pdk" name="platform/tools/asuite" path="tools/asuite" />
   <project groups="notdefault,tools" name="platform/tools/base" path="tools/base" />
   <project groups="notdefault,tools" name="platform/tools/build" path="tools/build" />
+  <project groups="tools" name="platform/tools/carrier_settings" path="tools/carrier_settings" />
   <project groups="pdk" name="platform/tools/currysrc" path="tools/currysrc" />
   <project groups="tools,pdk-fs" name="platform/tools/dexter" path="tools/dexter" />
+  <project groups="tools,pdk" name="platform/tools/doc_generation" path="tools/doc_generation" />
   <project groups="tools" name="platform/tools/external_updater" path="tools/external_updater" />
   <project groups="tools" name="platform/tools/external/fat32lib" path="tools/external/fat32lib" />
-  <project clone-depth="1" groups="tools" name="platform/tools/external/gradle" path="tools/external/gradle" />
   <project groups="notdefault,tools" name="platform/tools/idea" path="tools/idea" />
   <project groups="nopresubmit,pdk,tradefed" name="platform/tools/loganalysis" path="tools/loganalysis" />
-  <project groups="tools" name="platform/tools/metalava" path="tools/metalava" />
+  <project groups="pdk,tools" name="platform/tools/metalava" path="tools/metalava" />
   <project groups="notdefault,motodev" name="platform/tools/motodev" path="tools/motodev" />
+  <project groups="pdk-cw-fs,pdk-fs,pdk" name="tools/platform-compat" path="tools/platform-compat" />
   <project groups="pdk" name="platform/tools/ndkports" path="tools/ndkports" />
   <project groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" />
   <project groups="pdk,tools" name="platform/tools/security" path="tools/security" />
@@ -750,7 +815,8 @@
   <project groups="pdk" name="platform/tools/test/graphicsbenchmark" path="tools/test/graphicsbenchmark" />
   <project groups="pdk,tradefed" name="platform/tools/tradefederation" path="tools/tradefederation/core" />
   <project groups="pdk,tradefed" name="platform/tools/tradefederation/contrib" path="tools/tradefederation/contrib" />
-  <project groups="tools,cts,pdk-cw-fs,pdk-fs" name="platform/tools/trebuchet" path="tools/trebuchet" />
+  <project groups="tools,pdk" name="platform/tools/treble" path="tools/treble" />
+  <project groups="tools,cts,pdk,pdk-cw-fs,pdk-fs" name="platform/tools/trebuchet" path="tools/trebuchet" />
 
   <repo-hooks enabled-list="pre-upload" in-project="platform/tools/repohooks" />