Manifest for Android CTS 12.0 Release 6 (9265137)

Change-Id: If5271d6db52edbb752bd79763c018153992fa646

GLOBAL-PREUPLOAD.cfg

@@ -7,15 +7,11 @@ ignore_merged_commits = true
 
 [Builtin Hooks]
 commit_msg_test_field = true
-android_test_mapping_format = true
 
 [Tool Paths]
-bpfmt = ${REPO_ROOT}/prebuilts/build-tools/${BUILD_OS}/bin/bpfmt
 clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/clang-format
 git-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/git-clang-format
 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
-rustfmt = ${REPO_ROOT}/prebuilts/rust/${BUILD_OS}/stable/rustfmt
 cpplint = ${REPO_ROOT}/external/google-styleguide/cpplint/cpplint.py
-aidl-format = ${REPO_ROOT}/system/tools/aidl/aidl-format.sh

aosp-master-with-phones-gms.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-<!--
-    This branch is a master side branch and is configured to have all project
-    specific rules. When updating this manifest file, please also update the
-    project rule in google3 to ensure new projects get testing.
-    See go/side-branch-testing for details.
--->
-
-  <!-- pull in the standard AOSP-with-phones projects. -->
-  <include name="aosp-master-with-phones.xml" />
-
-  <project path="vendor/unbundled_google/packages/gms" name="platform/vendor/aosp/unbundled_google/packages/gms" groups="vendor" remote="goog" clone-depth="1" />
-
-</manifest>

aosp-master-with-phones.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-<!--
-    This branch is a master side branch and is configured to have all project
-    specific rules. When updating this manifest file, please also update the
-    project rule in google3 to ensure new projects get testing.
-    See go/side-branch-testing for details.
--->
-
-  <remote  name="goog"
-           fetch="sso://googleplex-android.googlesource.com/"
-           review="sso://googleplex-android.googlesource.com/"
-           revision="mirror-aosp-master-with-vendor" />
-
-  <!-- pull in the standard AOSP projects. -->
-  <include name="default.xml" />
-
-  <project path="vendor/google_devices/blueline" name="platform/vendor/aosp/google_devices/blueline" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/bonito" name="platform/vendor/aosp/google_devices/bonito" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/bramble" name="platform/vendor/aosp/google_devices/bramble" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/coral" name="platform/vendor/aosp/google_devices/coral" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/crosshatch" name="platform/vendor/aosp/google_devices/crosshatch" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/flame" name="platform/vendor/aosp/google_devices/flame" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/muskie" name="platform/vendor/aosp/google_devices/muskie" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/redfin" name="platform/vendor/aosp/google_devices/redfin" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/sargo" name="platform/vendor/aosp/google_devices/sargo" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google_devices/sunfish" name="platform/vendor/aosp/google_devices/sunfish" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google/misc/metrics_uploader_prebuilt" name="platform/vendor/google/misc/metrics_uploader_prebuilt" groups="vendor" remote="goog" clone-depth="1"/>
-  <project path="vendor/google/security" name="platform/vendor/google/security" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/google/tools" name="platform/vendor/google/tools" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/linaro/hikey960" name="platform/vendor/aosp/linaro/hikey960" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/bonito" name="platform/vendor/aosp/qcom/bonito" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/bramble" name="platform/vendor/aosp/qcom/bramble" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/blueline" name="platform/vendor/aosp/qcom/blueline" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/coral" name="platform/vendor/aosp/qcom/coral" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/crosshatch" name="platform/vendor/aosp/qcom/crosshatch" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/flame" name="platform/vendor/aosp/qcom/flame" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/redfin" name="platform/vendor/aosp/qcom/redfin" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/sargo" name="platform/vendor/aosp/qcom/sargo" groups="vendor" remote="goog" clone-depth="1" />
-  <project path="vendor/qcom/sunfish" name="platform/vendor/aosp/qcom/sunfish" groups="vendor" remote="goog" clone-depth="1" />
-
-</manifest>

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/"/>
-  <remote  name="aosp"
+  <default remote="aosp" sync-j="4" revision="refs/tags/android-cts-12.0_r6"/>
-           fetch=".."
+  <superproject name="platform/superproject" remote="aosp" revision="android-cts-12.0_r6"/>
-           review="https://android-review.googlesource.com/" />
+  <contactinfo bugurl="go/repo-bug"/>
-  <default revision="refs/tags/android-s-preview-1"
-           remote="aosp"
-           sync-j="4" />
-
   <project path="build/make" name="platform/build" groups="pdk">
     <copyfile src="core/root.mk" dest="Makefile"/>
     <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk"/>
@@ -23,6 +19,7 @@
     <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"/>
@@ -60,20 +57,22 @@
   <project path="device/generic/x86_64" name="device/generic/x86_64" groups="pdk"/>
   <project path="device/generic/vulkan-cereal" name="device/generic/vulkan-cereal" groups="pdk"/>
   <project path="device/google/atv" name="device/google/atv" groups="device,broadcom_pdk,generic_fs,pdk"/>
+  <project path="device/google/barbet" name="device/google/barbet" groups="device,barbet"/>
+  <project path="device/google/barbet-kernel" name="device/google/barbet-kernel" groups="device,barbet" clone-depth="1"/>
+  <project path="device/google/barbet-sepolicy" name="device/google/barbet-sepolicy" groups="device,barbet"/>
   <project path="device/google/bonito" name="device/google/bonito" groups="device,bonito"/>
   <project path="device/google/bonito-kernel" name="device/google/bonito-kernel" groups="device,bonito" clone-depth="1"/>
   <project path="device/google/bonito-sepolicy" name="device/google/bonito-sepolicy" groups="device,bonito"/>
   <project path="device/google/bramble" name="device/google/bramble" groups="device,bramble"/>
-  <project path="device/google/bramble-kernel" name="device/google/bramble-kernel" groups="device,bramble" clone-depth="1" />
   <project path="device/google/bramble-sepolicy" name="device/google/bramble-sepolicy" groups="device,bramble"/>
   <project path="device/google/contexthub" name="device/google/contexthub" groups="device,pdk"/>
   <project path="device/google/coral" name="device/google/coral" groups="device,coral,generic_fs"/>
   <project path="device/google/coral-kernel" name="device/google/coral-kernel" groups="device,coral,generic_fs" clone-depth="1"/>
   <project path="device/google/coral-sepolicy" name="device/google/coral-sepolicy" groups="device,coral,generic_fs"/>
   <project path="device/google/redbull" name="device/google/redbull" groups="device,redbull"/>
+  <project path="device/google/redbull-kernel" name="device/google/redbull-kernel" groups="device,bramble,redfin" clone-depth="1"/>
   <project path="device/google/redbull-sepolicy" name="device/google/redbull-sepolicy" groups="device,redbull"/>
   <project path="device/google/redfin" name="device/google/redfin" groups="device,redfin"/>
-  <project path="device/google/redfin-kernel" name="device/google/redfin-kernel" groups="device,redfin" clone-depth="1" />
   <project path="device/google/redfin-sepolicy" name="device/google/redfin-sepolicy" groups="device,redfin"/>
   <project path="device/google/sunfish" name="device/google/sunfish" groups="device,sunfish"/>
   <project path="device/google/sunfish-kernel" name="device/google/sunfish-kernel" groups="device,sunfish" clone-depth="1"/>
@@ -84,7 +83,7 @@
   <project path="device/google/cuttlefish" name="device/google/cuttlefish" groups="device,pdk"/>
   <project path="device/google/cuttlefish_prebuilts" name="device/google/cuttlefish_prebuilts" groups="device,pdk" clone-depth="1"/>
   <project path="device/google/fuchsia" name="device/google/fuchsia" groups="device"/>
-  <project path="device/google/trout" name="device/google/trout" groups="device,trout,gull" />
+  <project path="device/google/trout" name="device/google/trout" groups="device,trout,gull,pdk"/>
   <project path="device/google/vrservices" name="device/google/vrservices" groups="pdk"/>
   <project path="device/google_car" name="device/google_car" groups="pdk"/>
   <project path="device/linaro/dragonboard" name="device/linaro/dragonboard" groups="device,dragonboard,pdk"/>
@@ -118,6 +117,7 @@
   <project path="external/auto" name="platform/external/auto" groups="pdk"/>
   <project path="external/autotest" name="platform/external/autotest" groups="pdk-fs"/>
   <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"/>
@@ -131,13 +131,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/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"/>
@@ -178,6 +178,8 @@
   <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"/>
@@ -188,6 +190,8 @@
   <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"/>
@@ -221,8 +225,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"/>
@@ -235,13 +239,16 @@
   <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"/>
@@ -299,8 +306,6 @@
   <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"/>
@@ -313,10 +318,11 @@
   <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" revision="main" 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"/>
@@ -332,6 +338,7 @@
   <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"/>
@@ -349,6 +356,7 @@
   <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"/>
@@ -363,6 +371,7 @@
   <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"/>
@@ -383,6 +392,8 @@
   <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"/>
@@ -414,21 +425,36 @@
   <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/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"/>
@@ -440,17 +466,20 @@
   <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"/>
@@ -464,6 +493,8 @@
   <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"/>
@@ -476,15 +507,19 @@
   <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/paste" name="platform/external/rust/crates/paste" groups="pdk" />
+  <project path="external/rust/crates/plotters" name="platform/external/rust/crates/plotters" 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/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"/>
@@ -499,7 +534,10 @@
   <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"/>
@@ -507,11 +545,14 @@
   <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_json" name="platform/external/rust/crates/serde_json" 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"/>
@@ -525,6 +566,7 @@
   <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"/>
@@ -538,10 +580,16 @@
   <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"/>
@@ -563,6 +611,7 @@
   <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"/>
@@ -587,7 +636,6 @@
   <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"/>
@@ -624,6 +672,7 @@
   <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/minikin" name="platform/frameworks/minikin" groups="pdk-cw-fs,pdk-fs"/>
   <project path="frameworks/multidex" name="platform/frameworks/multidex" groups="pdk-cw-fs,pdk-fs"/>
   <project path="frameworks/native" name="platform/frameworks/native" groups="pdk"/>
@@ -718,6 +767,7 @@
   <project path="hardware/st/nfc" name="platform/hardware/st/nfc" groups="pdk"/>
   <project path="hardware/st/secure_element" name="platform/hardware/st/secure_element" groups="pdk"/>
   <project path="hardware/st/secure_element2" name="platform/hardware/st/secure_element2" groups="pdk"/>
+  <project path="hardware/samsung/nfc" name="platform/hardware/samsung/nfc" groups="pdk"/>
   <project path="hardware/ti/am57x" name="platform/hardware/ti/am57x" groups="pdk"/>
   <project path="kernel/configs" name="kernel/configs" groups="vts,pdk"/>
   <project path="kernel/prebuilts/4.19/arm64" name="kernel/prebuilts/4.19/arm64" groups="pdk" clone-depth="1"/>
@@ -743,7 +793,9 @@
   <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/SystemUI" name="platform/packages/apps/Car/SystemUI" groups="pdk-fs"/>
   <project path="packages/apps/Car/Cluster" name="platform/packages/apps/Car/Cluster" groups="pdk-fs"/>
+  <project path="packages/apps/Car/DebuggingRestrictionController" name="platform/packages/apps/Car/DebuggingRestrictionController" 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"/>
@@ -753,9 +805,11 @@
   <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/Provision" name="platform/packages/apps/Car/Provision" 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/SettingsIntelligence" name="platform/packages/apps/Car/SettingsIntelligence" 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"/>
@@ -771,6 +825,7 @@
   <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/ImsServiceEntitlement" name="platform/packages/apps/ImsServiceEntitlement" 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"/>
@@ -818,6 +873,7 @@
   <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"/>
@@ -827,6 +883,7 @@
   <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"/>
@@ -849,6 +906,7 @@
   <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/Iwlan" name="platform/packages/services/Iwlan" 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"/>
@@ -877,13 +935,11 @@
   <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"/>
@@ -898,6 +954,16 @@
   <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"/>
@@ -971,10 +1037,6 @@
   <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" />
   <project path="test/vts" name="platform/test/vts" groups="vts,pdk"/>
   <project path="test/vts-testcase/fuzz" name="platform/test/vts-testcase/fuzz" groups="vts,projectarch,pdk"/>
   <project path="test/vts-testcase/hal" name="platform/test/vts-testcase/hal" groups="vts,pdk"/>
@@ -984,6 +1046,7 @@
   <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"/>
@@ -1002,7 +1065,6 @@
   <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"/>
@@ -1014,12 +1076,8 @@
   <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/core" name="platform/tools/tradefederation" groups="pdk,tradefed" />
-  <project path="tools/tradefederation/contrib" name="platform/tools/tradefederation/contrib" groups="pdk,tradefed" />
   <project path="tools/tradefederation/prebuilts" name="platform/tools/tradefederation/prebuilts" groups="pdk,tradefed"/>
   <project path="tools/treble" name="platform/tools/treble" groups="tools,pdk"/>
   <project path="tools/trebuchet" name="platform/tools/trebuchet" groups="tools,cts,pdk,pdk-cw-fs,pdk-fs"/>
-
-
   <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload"/>
 </manifest>