Manifest for Android VTS 13.0 Release 11 (12904885)

Change-Id: I6024786447ba75543df301d7130bac505c6bb1c1

GLOBAL-PREUPLOAD.cfg

@@ -7,14 +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

OWNERS

@@ -1,11 +0,0 @@
-byi@google.com
-delphij@google.com
-dwillemsen@google.com
-rassb@google.com
-rtenneti@google.com
-alexcheung@google.com
-ryepishev@google.com
-ipalant@google.com
-baligh@google.com #{LAST_RESORT_SUGGESTION}
-edheyl@google.com #{LAST_RESORT_SUGGESTION}
-samccone@google.com #{LAST_RESORT_SUGGESTION}

default.xml

@@ -1,19 +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-vts-13.0_r11"/>
-           fetch=".."
-           review="https://android-review.googlesource.com/" />
-  <default revision="main"
-           remote="aosp"
-           sync-j="4" />
-
-  <manifest-server url="http://android-smartsync.corp.google.com/android.googlesource.com/manifestserver" />
-
-  <superproject name="platform/superproject" remote="aosp" revision="main-plus-java-next-dev"/>
   <contactinfo bugurl="go/repo-bug"/>
-
+  <project path="build/make" name="platform/build" groups="pdk">
-  <project path="build/make" name="platform/build" groups="pdk" revision="main-plus-java-next-dev">
     <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk"/>
     <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default"/>
     <linkfile src="core" dest="build/core"/>
@@ -29,16 +19,16 @@
   <project path="build/bazel_common_rules" name="platform/build/bazel_common_rules" groups="pdk"/>
   <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" revision="main-plus-java-next-dev" >
+  <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"/>
   </project>
-  <project path="art" name="platform/art" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="art" name="platform/art" groups="pdk"/>
   <project path="bionic" name="platform/bionic" groups="pdk"/>
   <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk"/>
   <project path="bootable/libbootloader" name="platform/bootable/libbootloader" groups="vts,pdk"/>
   <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs,pdk-fs"/>
-  <project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs,pdk-fs" revision="main-plus-java-next-dev" />
+  <project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs,pdk-fs"/>
   <project path="developers/build" name="platform/developers/build" groups="developers,pdk"/>
   <project path="developers/demos" name="platform/developers/demos" groups="developers"/>
   <project path="developers/samples/android" name="platform/developers/samples/android" groups="developers"/>
@@ -66,22 +56,21 @@
   <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/bluejay" name="device/google/bluejay" groups="device,bluejay"/>
-  <project path="device/google/bonito-kernel" name="device/google/bonito-kernel" groups="device,bonito" clone-depth="1" />
+  <project path="device/google/bluejay-sepolicy" name="device/google/bluejay-sepolicy" groups="device,bluejay"/>
-  <project path="device/google/bonito-sepolicy" name="device/google/bonito-sepolicy" groups="device,bonito" />
+  <project path="device/google/bluejay-kernel" name="device/google/bluejay-kernel" groups="device,bluejay" clone-depth="1"/>
   <project path="device/google/bramble" name="device/google/bramble" groups="device,bramble"/>
   <project path="device/google/bramble-sepolicy" name="device/google/bramble-sepolicy" groups="device,bramble"/>
   <project path="device/google/contexthub" name="device/google/contexthub" groups="device,pdk"/>
   <project path="device/google/coral" name="device/google/coral" groups="device,coral,generic_fs"/>
   <project path="device/google/coral-kernel" name="device/google/coral-kernel" groups="device,coral,generic_fs" clone-depth="1"/>
   <project path="device/google/coral-sepolicy" name="device/google/coral-sepolicy" groups="device,coral,generic_fs"/>
-  <project path="device/google/gs101" name="device/google/gs101" groups="device,slider" />
+  <project path="device/google/gs101" name="device/google/gs101" groups="device,slider,bluejay,pdk-gs-arm"/>
-  <project path="device/google/gs101-sepolicy" name="device/google/gs101-sepolicy" groups="device,slider" />
+  <project path="device/google/gs101-sepolicy" name="device/google/gs101-sepolicy" groups="device,slider,bluejay,pdk-gs-arm"/>
-  <project path="device/google/gs-common" name="device/google/gs-common" groups="device,slider,pdk-gs-arm" />
+  <project path="device/google/gs-common" name="device/google/gs-common" groups="device,slider,bluejay,pdk-gs-arm"/>
-  <project path="device/google/raviole" name="device/google/raviole" groups="device,slider" />
+  <project path="device/google/raviole" name="device/google/raviole" groups="device,slider,pdk-gs-arm"/>
-  <project path="device/google/raviole-kernel" name="device/google/raviole-kernel" groups="device,slider" clone-depth="1" />
+  <project path="device/google/raviole-kernel" name="device/google/raviole-kernel" groups="device,slider,pdk-gs-arm" clone-depth="1"/>
   <project path="device/google/redbull" name="device/google/redbull" groups="device,redbull"/>
   <project path="device/google/redbull-kernel" name="device/google/redbull-kernel" groups="device,bramble,redfin" clone-depth="1"/>
   <project path="device/google/redbull-sepolicy" name="device/google/redbull-sepolicy" groups="device,redbull"/>
@@ -92,7 +81,7 @@
   <project path="device/google/sunfish-sepolicy" name="device/google/sunfish-sepolicy" groups="device,sunfish"/>
   <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/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"/>
@@ -116,24 +105,24 @@
   <project path="external/apache-commons-bcel" name="platform/external/apache-commons-bcel" groups="pdk"/>
   <project path="external/apache-commons-compress" name="platform/external/apache-commons-compress" groups="pdk"/>
   <project path="external/apache-commons-math" name="platform/external/apache-commons-math" groups="pdk"/>
-  <project path="external/apache-harmony" name="platform/external/apache-harmony" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/apache-harmony" name="platform/external/apache-harmony" groups="pdk"/>
-  <project path="external/apache-http" name="platform/external/apache-http" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/apache-http" name="platform/external/apache-http" groups="pdk"/>
-  <project path="external/apache-xml" name="platform/external/apache-xml" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/apache-xml" name="platform/external/apache-xml" groups="pdk"/>
   <project path="external/arm-neon-tests" name="platform/external/arm-neon-tests" groups="vendor"/>
   <project path="external/arm-optimized-routines" name="platform/external/arm-optimized-routines" groups="pdk"/>
   <project path="external/arm-trusted-firmware" name="platform/external/arm-trusted-firmware" groups="pdk"/>
   <project path="external/auto" name="platform/external/auto" groups="pdk"/>
   <project path="external/autotest" name="platform/external/autotest" groups="pdk-fs"/>
-  <project path="external/android-nn-driver" name="platform/external/android-nn-driver" groups="pdk-lassen" />
+  <project path="external/android-nn-driver" name="platform/external/android-nn-driver" groups="pdk-lassen,pdk-gs-arm"/>
-  <project path="external/armnn" name="platform/external/armnn" groups="pdk-lassen" />
+  <project path="external/armnn" name="platform/external/armnn" groups="pdk-lassen,pdk-gs-arm"/>
   <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/bazel-skylib" name="platform/external/bazel-skylib" 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"/>
-  <project path="external/boringssl" name="platform/external/boringssl" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/boringssl" name="platform/external/boringssl" groups="pdk"/>
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/bouncycastle" name="platform/external/bouncycastle" groups="pdk"/>
   <project path="external/bpftool" name="platform/external/bpftool" groups="pdk"/>
   <project path="external/brotli" name="platform/external/brotli" groups="pdk"/>
   <project path="external/bsdiff" name="platform/external/bsdiff" groups="pdk"/>
@@ -146,12 +135,12 @@
   <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" revision="main-plus-java-next-dev" />
+  <project path="external/cldr" name="platform/external/cldr" groups="pdk"/>
   <project path="external/cn-cbor" name="platform/external/cn-cbor" groups="pdk"/>
   <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="pdk"/>
-  <project path="external/ComputeLibrary" name="platform/external/ComputeLibrary" groups="pdk-lassen" />
+  <project path="external/ComputeLibrary" name="platform/external/ComputeLibrary" groups="pdk-lassen,pdk-gs-arm"/>
   <project path="external/connectedappssdk" name="platform/external/connectedappssdk" groups="pdk"/>
-  <project path="external/conscrypt" name="platform/external/conscrypt" groups="pdk" revision="main-plus-java-next-dev" />
+  <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"/>
   <project path="external/crcalc" name="platform/external/crcalc" groups="pdk"/>
@@ -242,7 +231,7 @@
   <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" groups="pdk,qcom_msm8x26"/>
   <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" revision="main-plus-java-next-dev" />
+  <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"/>
   <project path="external/image_io" name="platform/external/image_io" groups="pdk"/>
@@ -293,6 +282,7 @@
   <project path="external/libchrome" name="platform/external/libchrome" groups="pdk"/>
   <project path="external/libchromeos-rs" name="platform/external/libchromeos-rs" groups="pdk"/>
   <project path="external/libconfig" name="platform/external/libconfig" groups="pdk"/>
+  <project path="external/libcppbor" name="platform/external/libcppbor" groups="pdk"/>
   <project path="external/libcups" name="platform/external/libcups" groups="pdk-cw-fs,pdk-fs"/>
   <project path="external/libcxx" name="platform/external/libcxx" groups="pdk"/>
   <project path="external/libcxxabi" name="platform/external/libcxxabi" groups="pdk"/>
@@ -317,6 +307,7 @@
   <project path="external/libnl" name="platform/external/libnl" groups="pdk"/>
   <project path="external/libogg" name="platform/external/libogg" groups="pdk"/>
   <project path="external/libopus" name="platform/external/libopus" groups="pdk"/>
+  <project path="external/libpalmrejection" name="platform/external/libpalmrejection" groups="pdk"/>
   <project path="external/libpcap" name="platform/external/libpcap" groups="pdk"/>
   <project path="external/libphonenumber" name="platform/external/libphonenumber" groups="pdk"/>
   <project path="external/libpng" name="platform/external/libpng" groups="pdk"/>
@@ -354,9 +345,9 @@
   <project path="external/python/mobly" name="platform/external/python/mobly" groups="pdk"/>
   <project path="external/mobly-bundled-snippets" name="platform/external/mobly-bundled-snippets" groups="pdk"/>
   <project path="external/mobly-snippet-lib" name="platform/external/mobly-snippet-lib" groups="pdk"/>
-  <project path="external/mockftpserver" name="platform/external/mockftpserver" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/mockftpserver" name="platform/external/mockftpserver" groups="pdk"/>
   <project path="external/mockito" name="platform/external/mockito" groups="pdk"/>
-  <project path="external/mockwebserver" name="platform/external/mockwebserver" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/mockwebserver" name="platform/external/mockwebserver" groups="pdk"/>
   <project path="external/modp_b64" name="platform/external/modp_b64" groups="pdk"/>
   <project path="external/mp4parser" name="platform/external/mp4parser" groups="pdk"/>
   <project path="external/ms-tpm-20-ref" name="platform/external/ms-tpm-20-ref" groups="pdk"/>
@@ -379,10 +370,10 @@
   <project path="external/objenesis" name="platform/external/objenesis" groups="pdk"/>
   <project path="external/oboe" name="platform/external/oboe" groups="pdk"/>
   <project path="external/obstack" name="platform/external/obstack" groups="pdk"/>
-  <project path="external/oj-libjdwp" name="platform/external/oj-libjdwp" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/oj-libjdwp" name="platform/external/oj-libjdwp" groups="pdk"/>
-  <project path="external/okhttp" name="platform/external/okhttp" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/okhttp" name="platform/external/okhttp" groups="pdk"/>
-  <project path="external/okhttp4" name="platform/external/okhttp4" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/okhttp4" name="platform/external/okhttp4" groups="pdk"/>
-  <project path="external/okio" name="platform/external/okio" groups="pdk" revision="main-plus-java-next-dev" />
+  <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"/>
@@ -450,7 +441,6 @@
   <project path="external/rootdev" name="platform/external/rootdev" groups="pdk"/>
   <project path="external/Reactive-Extensions/RxCpp" name="platform/external/Reactive-Extensions/RxCpp" groups="pdk"/>
   <project path="external/rnnoise" name="platform/external/rnnoise" groups="pdk"/>
-  <project path="external/rust/crates/aarch64-paging" name="platform/external/rust/crates/aarch64-paging" groups="pdk" />
   <project path="external/rust/crates/ahash" name="platform/external/rust/crates/ahash" groups="pdk"/>
   <project path="external/rust/crates/aho-corasick" name="platform/external/rust/crates/aho-corasick" groups="pdk"/>
   <project path="external/rust/crates/android_logger" name="platform/external/rust/crates/android_logger" groups="pdk"/>
@@ -471,7 +461,6 @@
   <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/buddy_system_allocator" name="platform/external/rust/crates/buddy_system_allocator" 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"/>
@@ -509,8 +498,6 @@
   <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/foreign-types" name="platform/external/rust/crates/foreign-types" groups="pdk" />
-  <project path="external/rust/crates/foreign-types-shared" name="platform/external/rust/crates/foreign-types-shared" groups="pdk" />
   <project path="external/rust/crates/form_urlencoded" name="platform/external/rust/crates/form_urlencoded" groups="pdk"/>
   <project path="external/rust/crates/futures" name="platform/external/rust/crates/futures" groups="pdk"/>
   <project path="external/rust/crates/futures-channel" name="platform/external/rust/crates/futures-channel" groups="pdk"/>
@@ -524,7 +511,6 @@
   <project path="external/rust/crates/gdbstub" name="platform/external/rust/crates/gdbstub" groups="pdk"/>
   <project path="external/rust/crates/gdbstub_arch" name="platform/external/rust/crates/gdbstub_arch" groups="pdk"/>
   <project path="external/rust/crates/getrandom" name="platform/external/rust/crates/getrandom" groups="pdk"/>
-  <project path="external/rust/crates/glam" name="platform/external/rust/crates/glam" 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"/>
@@ -571,7 +557,6 @@
   <project path="external/rust/crates/oid-registry" name="platform/external/rust/crates/oid-registry" 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/openssl" name="platform/external/rust/crates/openssl" 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"/>
@@ -596,7 +581,6 @@
   <project path="external/rust/crates/proc-macro2" name="platform/external/rust/crates/proc-macro2" groups="pdk"/>
   <project path="external/rust/crates/protobuf" name="platform/external/rust/crates/protobuf" groups="pdk"/>
   <project path="external/rust/crates/protobuf-codegen" name="platform/external/rust/crates/protobuf-codegen" groups="pdk"/>
-  <project path="external/rust/crates/psci" name="platform/external/rust/crates/psci" groups="pdk" />
   <project path="external/rust/crates/quiche" name="platform/external/rust/crates/quiche" groups="pdk"/>
   <project path="external/rust/crates/quickcheck" name="platform/external/rust/crates/quickcheck" groups="pdk"/>
   <project path="external/rust/crates/quote" name="platform/external/rust/crates/quote" groups="pdk"/>
@@ -640,7 +624,6 @@
   <project path="external/rust/crates/syn-mid" name="platform/external/rust/crates/syn-mid" groups="pdk"/>
   <project path="external/rust/crates/tempfile" name="platform/external/rust/crates/tempfile" groups="pdk"/>
   <project path="external/rust/crates/termcolor" name="platform/external/rust/crates/termcolor" groups="pdk"/>
-  <project path="external/rust/crates/terminal-size" name="platform/external/rust/crates/terminal-size" groups="pdk" />
   <project path="external/rust/crates/textwrap" name="platform/external/rust/crates/textwrap" groups="pdk"/>
   <project path="external/rust/crates/thiserror" name="platform/external/rust/crates/thiserror" groups="pdk"/>
   <project path="external/rust/crates/thiserror-impl" name="platform/external/rust/crates/thiserror-impl" groups="pdk"/>
@@ -684,7 +667,6 @@
   <project path="external/shaderc/spirv-headers" name="platform/external/shaderc/spirv-headers" groups="pdk"/>
   <project path="external/shflags" name="platform/external/shflags" groups="pdk"/>
   <project path="external/skia" name="platform/external/skia" groups="pdk,qcom_msm8x26"/>
-  <project path="external/skqp" name="platform/external/skqp" groups="cts,pdk" clone-depth="1" />
   <project path="external/sl4a" name="platform/external/sl4a" groups="pdk"/>
   <project path="external/slf4j" name="platform/external/slf4j" groups="pdk"/>
   <project path="external/smali" name="platform/external/smali" groups="pdk"/>
@@ -707,7 +689,6 @@
   <project path="external/testng" name="platform/external/testng" groups="pdk"/>
   <project path="external/tflite-support" name="platform/external/tflite-support" groups="pdk"/>
   <project path="external/timezone-boundary-builder" name="platform/external/timezone-boundary-builder" groups="pdk" clone-depth="2"/>
-  <project path="external/tink" name="platform/external/tink" groups="pdk" />
   <project path="external/tinyalsa" name="platform/external/tinyalsa" groups="pdk"/>
   <project path="external/tinyalsa_new" name="platform/external/tinyalsa_new" groups="pdk"/>
   <project path="external/tinycompress" name="platform/external/tinycompress" groups="pdk"/>
@@ -722,11 +703,12 @@
   <project path="external/universal-tween-engine" name="platform/external/universal-tween-engine"/>
   <project path="external/ukey2" name="platform/external/ukey2" groups="pdk"/>
   <project path="external/usrsctp" name="platform/external/usrsctp" groups="pdk"/>
+  <project path="external/uwb" name="platform/external/uwb" groups="pdk"/>
   <project path="external/v4l2_codec2" name="platform/external/v4l2_codec2" groups="pdk"/>
   <project path="external/vboot_reference" name="platform/external/vboot_reference" groups="vboot,pdk-fs"/>
   <project path="external/virglrenderer" name="platform/external/virglrenderer" groups="pdk"/>
   <project path="external/vixl" name="platform/external/vixl" groups="pdk"/>
-  <project path="external/vogar" name="platform/external/vogar" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/vogar" name="platform/external/vogar" groups="pdk"/>
   <project path="external/volley" name="platform/external/volley" groups="pdk"/>
   <project path="external/vulkan-headers" name="platform/external/vulkan-headers" groups="pdk"/>
   <project path="external/vulkan-validation-layers" name="platform/external/vulkan-validation-layers" groups="pdk"/>
@@ -738,7 +720,7 @@
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" groups="pdk"/>
   <project path="external/wmediumd" name="platform/external/wmediumd" groups="pdk"/>
   <project path="external/wuffs-mirror-release-c" name="platform/external/wuffs-mirror-release-c" groups="pdk,qcom_msm8x26"/>
-  <project path="external/wycheproof" name="platform/external/wycheproof" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="external/wycheproof" name="platform/external/wycheproof" groups="pdk"/>
   <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" groups="pdk"/>
   <project path="external/xz-embedded" name="platform/external/xz-embedded" groups="pdk"/>
   <project path="external/xz-java" name="platform/external/xz-java" groups="pdk"/>
@@ -791,9 +773,9 @@
   <project path="hardware/google/av" name="platform/hardware/google/av" groups="pdk"/>
   <project path="hardware/google/camera" name="platform/hardware/google/camera" groups="pdk"/>
   <project path="hardware/google/easel" name="platform/hardware/google/easel" groups="pdk,easel"/>
-  <project path="hardware/google/gchips" name="platform/hardware/google/gchips" groups="pdk-lassen" />
+  <project path="hardware/google/gchips" name="platform/hardware/google/gchips" groups="pdk-lassen,pdk-gs-arm"/>
-  <project path="hardware/google/graphics/common" name="platform/hardware/google/graphics/common" groups="pdk-lassen" />
+  <project path="hardware/google/graphics/common" name="platform/hardware/google/graphics/common" groups="pdk-lassen,pdk-gs-arm"/>
-  <project path="hardware/google/graphics/gs101" name="platform/hardware/google/graphics/gs101" groups="pdk-lassen" />
+  <project path="hardware/google/graphics/gs101" name="platform/hardware/google/graphics/gs101" groups="pdk-lassen,pdk-gs-arm"/>
   <project path="hardware/google/interfaces" name="platform/hardware/google/interfaces" groups="pdk"/>
   <project path="hardware/google/pixel" name="platform/hardware/google/pixel" groups="generic_fs,pixel"/>
   <project path="hardware/google/pixel-sepolicy" name="platform/hardware/google/pixel-sepolicy" groups="generic_fs,pixel"/>
@@ -882,8 +864,8 @@
   <project path="kernel/prebuilts/common-modules/virtual-device/mainline/arm64" name="kernel/prebuilts/common-modules/virtual-device/mainline/arm64" groups="pdk" clone-depth="1"/>
   <project path="kernel/prebuilts/common-modules/virtual-device/mainline/x86-64" name="kernel/prebuilts/common-modules/virtual-device/mainline/x86-64" groups="pdk" clone-depth="1"/>
   <project path="kernel/tests" name="kernel/tests" groups="vts,pdk"/>
-  <project path="libcore" name="platform/libcore" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="libcore" name="platform/libcore" groups="pdk"/>
-  <project path="libnativehelper" name="platform/libnativehelper" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="libnativehelper" name="platform/libnativehelper" groups="pdk"/>
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/apps/Browser2" name="platform/packages/apps/Browser2" groups="pdk-fs"/>
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" groups="pdk-fs"/>
@@ -892,23 +874,19 @@
   <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"/>
   <project path="packages/apps/Car/Launcher" name="platform/packages/apps/Car/Launcher" groups="pdk-fs"/>
   <project path="packages/apps/Car/LinkViewer" name="platform/packages/apps/Car/LinkViewer" groups="pdk-fs"/>
   <project path="packages/apps/Car/LocalMediaPlayer" name="platform/packages/apps/Car/LocalMediaPlayer" groups="pdk-fs"/>
-  <project path="packages/apps/Car/Media" name="platform/packages/apps/Car/Media" groups="pdk-fs" />
-  <project path="packages/apps/Car/Messenger" name="platform/packages/apps/Car/Messenger" groups="pdk-fs" />
   <project path="packages/apps/Car/Notification" name="platform/packages/apps/Car/Notification" groups="pdk-fs"/>
   <project path="packages/apps/Car/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/systemlibs" name="platform/packages/apps/Car/systemlibs" groups="pdk-fs"/>
   <project path="packages/apps/Car/SystemUpdater" name="platform/packages/apps/Car/SystemUpdater" groups="pdk-fs"/>
-  <project path="packages/apps/Car/libs" name="platform/packages/apps/Car/libs" groups="pdk-fs" />
-  <project path="packages/apps/Car/tests" name="platform/packages/apps/Car/tests" groups="pdk-fs" />
   <project path="packages/apps/CarrierConfig" name="platform/packages/apps/CarrierConfig" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" groups="pdk-cw-fs,pdk-fs"/>
@@ -946,6 +924,7 @@
   <project path="packages/apps/SpareParts" name="platform/packages/apps/SpareParts" groups="pdk-fs"/>
   <project path="packages/apps/Stk" name="platform/packages/apps/Stk" groups="apps_stk,pdk-fs"/>
   <project path="packages/apps/StorageManager" name="platform/packages/apps/StorageManager" groups="pdk-fs"/>
+  <project path="packages/apps/SystemUIGo" name="platform/packages/apps/SystemUIGo" groups="pdk-fs"/>
   <project path="packages/apps/Tag" name="platform/packages/apps/Tag" groups="pdk-fs"/>
   <project path="packages/apps/Test/connectivity" name="platform/packages/apps/Test/connectivity" groups="pdk"/>
   <project path="packages/apps/TimeZoneData" name="platform/packages/apps/TimeZoneData" groups="pdk"/>
@@ -960,6 +939,7 @@
   <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" groups="pdk-fs"/>
   <project path="packages/inputmethods/LeanbackIME" name="platform/packages/inputmethods/LeanbackIME" groups="pdk-fs"/>
   <project path="packages/modules/adb" name="platform/packages/modules/adb" groups="pdk"/>
+  <project path="packages/modules/AdServices" name="platform/packages/modules/AdServices" groups="pdk-fs"/>
   <project path="packages/modules/AppSearch" name="platform/packages/modules/AppSearch" groups="pdk"/>
   <project path="packages/modules/ArtPrebuilt" name="platform/packages/modules/ArtPrebuilt" groups="pdk" clone-depth="1"/>
   <project path="packages/modules/Bluetooth" name="platform/packages/modules/Bluetooth" groups="pdk"/>
@@ -969,7 +949,6 @@
   <project path="packages/modules/CellBroadcastService" name="platform/packages/modules/CellBroadcastService" groups="pdk"/>
   <project path="packages/modules/common" name="platform/packages/modules/common" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/modules/Connectivity" name="platform/packages/modules/Connectivity" groups="pdk-cw-fs,pdk-fs"/>
-  <project path="packages/modules/Cronet" name="platform/packages/modules/Cronet" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/modules/ExtServices" name="platform/packages/modules/ExtServices" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/modules/GeoTZ" name="platform/packages/modules/GeoTZ" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/modules/Gki" name="platform/packages/modules/Gki" groups="pdk-cw-fs,pdk-fs"/>
@@ -980,6 +959,7 @@
   <project path="packages/modules/NetworkPermissionConfig" name="platform/packages/modules/NetworkPermissionConfig" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/modules/NetworkStack" name="platform/packages/modules/NetworkStack" groups="pdk-cw-fs,pdk-fs"/>
   <project path="packages/modules/NeuralNetworks" name="platform/packages/modules/NeuralNetworks" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="packages/modules/OnDevicePersonalization" name="platform/packages/modules/OnDevicePersonalization" groups="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"/>
@@ -1037,7 +1017,7 @@
   <project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" groups="darwin,pdk,tradefed" clone-depth="1"/>
   <project path="prebuilts/go/linux-x86" name="platform/prebuilts/go/linux-x86" groups="linux,pdk,tradefed" clone-depth="1"/>
   <project path="prebuilts/gradle-plugin" name="platform/prebuilts/gradle-plugin" groups="pdk,pdk-cw-fs,pdk-fs" clone-depth="1"/>
-  <project path="prebuilts/jdk/jdk11" name="platform/prebuilts/jdk/jdk11" groups="pdk" clone-depth="1" revision="main-plus-java-next-dev" />
+  <project path="prebuilts/jdk/jdk11" name="platform/prebuilts/jdk/jdk11" groups="pdk" clone-depth="1"/>
   <project path="prebuilts/jdk/jdk17" name="platform/prebuilts/jdk/jdk17" groups="pdk" clone-depth="1"/>
   <project path="prebuilts/jdk/jdk8" name="platform/prebuilts/jdk/jdk8" groups="pdk" clone-depth="1"/>
   <project path="prebuilts/jdk/jdk9" name="platform/prebuilts/jdk/jdk9" groups="pdk" clone-depth="1"/>
@@ -1046,16 +1026,20 @@
   <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/AdServices" name="platform/prebuilts/module_sdk/AdServices" groups="pdk" clone-depth="1"/>
+  <project path="prebuilts/module_sdk/AppSearch" name="platform/prebuilts/module_sdk/AppSearch" groups="pdk" clone-depth="1"/>
   <project path="prebuilts/module_sdk/Bluetooth" name="platform/prebuilts/module_sdk/Bluetooth" 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/OnDevicePersonalization" name="platform/prebuilts/module_sdk/OnDevicePersonalization" 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/Uwb" name="platform/prebuilts/module_sdk/Uwb" 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"/>
@@ -1088,10 +1072,8 @@
   <project path="system/incremental_delivery" name="platform/system/incremental_delivery" groups="pdk"/>
   <project path="system/iorap" name="platform/system/iorap" groups="pdk"/>
   <project path="system/keymaster" name="platform/system/keymaster" groups="pdk"/>
-  <project path="system/keymint" name="platform/system/keymint" groups="pdk" />
   <project path="system/libartpalette" name="platform/system/libartpalette" groups="pdk"/>
   <project path="system/libbase" name="platform/system/libbase" groups="pdk"/>
-  <project path="system/libcppbor" name="platform/system/libcppbor" groups="pdk" />
   <project path="system/libfmq" name="platform/system/libfmq" groups="pdk"/>
   <project path="system/libhidl" name="platform/system/libhidl" groups="pdk"/>
   <project path="system/libhwbinder" name="platform/system/libhwbinder" groups="pdk"/>
@@ -1118,7 +1100,7 @@
   <project path="system/server_configurable_flags" name="platform/system/server_configurable_flags" groups="pdk"/>
   <project path="system/teeui" name="platform/system/teeui" groups="pdk"/>
   <project path="system/testing/gtest_extras" name="platform/system/testing/gtest_extras" groups="pdk"/>
-  <project path="system/timezone" name="platform/system/timezone" groups="pdk" revision="main-plus-java-next-dev" />
+  <project path="system/timezone" name="platform/system/timezone" groups="pdk"/>
   <project path="system/tools/aidl" name="platform/system/tools/aidl" groups="pdk"/>
   <project path="system/tools/hidl" name="platform/system/tools/hidl" groups="pdk"/>
   <project path="system/tools/mkbootimg" name="platform/system/tools/mkbootimg" groups="pdk"/>
@@ -1133,7 +1115,6 @@
   <project path="test/app_compat/csuite" name="platform/test/app_compat/csuite" groups="pdk"/>
   <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/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"/>
@@ -1157,6 +1138,7 @@
   <project path="tools/build" name="platform/tools/build" groups="notdefault,tools"/>
   <project path="tools/carrier_settings" name="platform/tools/carrier_settings" groups="tools"/>
   <project path="tools/currysrc" name="platform/tools/currysrc" groups="pdk"/>
+  <project path="tools/deviceinfra/prebuilts" name="platform/tools/deviceinfra/prebuilts" groups="pdk,tools"/>
   <project path="tools/dexter" name="platform/tools/dexter" groups="tools,pdk-fs"/>
   <project path="tools/doc_generation" name="platform/tools/doc_generation" groups="tools,pdk"/>
   <project path="tools/external_updater" name="platform/tools/external_updater" groups="tools"/>
@@ -1175,18 +1157,8 @@
   <project path="tools/test/graphicsbenchmark" name="platform/tools/test/graphicsbenchmark" groups="pdk"/>
   <project path="tools/test/mobly_snippets" name="platform/tools/test/mobly_snippets" 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/prebuilts" name="platform/tools/tradefederation/prebuilts" groups="pdk,tradefed" clone-depth="1"/>
-  <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"/>
-
-
-  <!--
-    Merge marker to make it easier for git to merge AOSP-only manifest
-    changes to a custom manifest.  Please keep this marker here and
-    refrain from making changes on or below it.
-  -->
 </manifest>