Manifest for Android CTS 10.0 Release 6 (6958444)

Change-Id: Ia6a36ecd1bb6dc550fa779ab6050265ddc57474d

GLOBAL-PREUPLOAD.cfg

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

default.xml

@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
 <manifest>
 
   <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
-  <default remote="aosp" revision="refs/tags/platform-tools-29.0.1" sync-j="4" />
+  <default remote="aosp" revision="refs/tags/android-cts-10.0_r6" sync-j="4" />
 
   <project groups="pdk" name="platform/build" path="build/make">
     <copyfile dest="Makefile" src="core/root.mk" />
@@ -22,15 +21,14 @@
   <project groups="pdk" name="platform/art" path="art" />
   <project groups="pdk" name="platform/bionic" path="bionic" />
   <project groups="pdk" name="platform/bootable/recovery" path="bootable/recovery" />
-  <project groups="pdk" name="platform/compatibility/cdd" path="compatibility/cdd" />
   <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/cts" path="cts" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/dalvik" path="dalvik" />
-  <project groups="developers" name="platform/developers/build" path="developers/build" />
+  <project groups="developers,pdk" name="platform/developers/build" path="developers/build" />
   <project groups="developers" name="platform/developers/demos" path="developers/demos" />
   <project groups="developers" name="platform/developers/samples/android" path="developers/samples/android" />
   <project groups="developers,pdk-cw-fs,pdk-fs" name="platform/development" path="development" />
   <project groups="device,yukawa,pdk" name="device/amlogic/yukawa" path="device/amlogic/yukawa" />
-  <project clone-depth="2" groups="device,yukawa,pdk" name="device/amlogic/yukawa-kernel" path="device/amlogic/yukawa-kernel" />
+  <project clone-depth="1" groups="device,yukawa,pdk" name="device/amlogic/yukawa-kernel" path="device/amlogic/yukawa-kernel" />
   <project groups="pdk-cw-fs,pdk" name="device/common" path="device/common" />
   <project groups="pdk" name="device/generic/arm64" path="device/generic/arm64" />
   <project groups="pdk" name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" />
@@ -53,21 +51,21 @@
   <project clone-depth="1" groups="device,bonito" name="device/google/bonito-kernel" path="device/google/bonito-kernel" />
   <project groups="device,bonito" name="device/google/bonito-sepolicy" path="device/google/bonito-sepolicy" />
   <project groups="device,marlin,pdk" name="device/google/contexthub" path="device/google/contexthub" />
-  <project groups="device,crosshatch" name="device/google/crosshatch" path="device/google/crosshatch" />
+  <project groups="device,crosshatch,generic_fs" name="device/google/crosshatch" path="device/google/crosshatch" />
-  <project clone-depth="1" groups="device,crosshatch" name="device/google/crosshatch-kernel" path="device/google/crosshatch-kernel" />
+  <project clone-depth="1" groups="device,crosshatch,generic_fs" name="device/google/crosshatch-kernel" path="device/google/crosshatch-kernel" />
-  <project groups="device,crosshatch" name="device/google/crosshatch-sepolicy" path="device/google/crosshatch-sepolicy" />
+  <project groups="device,crosshatch,generic_fs" name="device/google/crosshatch-sepolicy" path="device/google/crosshatch-sepolicy" />
   <project groups="device,pdk" name="device/google/cuttlefish" path="device/google/cuttlefish" />
   <project groups="device,pdk" name="device/google/cuttlefish_common" path="device/google/cuttlefish_common" />
   <project clone-depth="1" groups="device,pdk" name="device/google/cuttlefish_kernel" path="device/google/cuttlefish_kernel" />
   <project clone-depth="1" groups="device,pdk" name="device/google/cuttlefish_vmm" path="device/google/cuttlefish_vmm" />
   <project groups="device" name="device/google/fuchsia" path="device/google/fuchsia" />
-  <project groups="device,marlin,pdk" name="device/google/marlin" path="device/google/marlin" />
+  <project groups="device,marlin" name="device/google/marlin" path="device/google/marlin" />
-  <project clone-depth="1" groups="device,marlin,pdk" name="device/google/marlin-kernel" path="device/google/marlin-kernel" />
+  <project clone-depth="1" groups="device,marlin" name="device/google/marlin-kernel" path="device/google/marlin-kernel" />
-  <project groups="device,muskie,pdk" name="device/google/muskie" path="device/google/muskie" />
+  <project groups="device,generic_fs,muskie" name="device/google/muskie" path="device/google/muskie" />
-  <project groups="device,taimen,pdk" name="device/google/taimen" path="device/google/taimen" />
+  <project groups="device,taimen" name="device/google/taimen" path="device/google/taimen" />
   <project clone-depth="1" groups="pdk" name="device/google/vrservices" path="device/google/vrservices" />
-  <project groups="device,wahoo,pdk" name="device/google/wahoo" path="device/google/wahoo" />
+  <project groups="device,generic_fs,wahoo" name="device/google/wahoo" path="device/google/wahoo" />
-  <project clone-depth="1" groups="device,wahoo,pdk" name="device/google/wahoo-kernel" path="device/google/wahoo-kernel" />
+  <project clone-depth="1" groups="device,generic_fs,wahoo" name="device/google/wahoo-kernel" path="device/google/wahoo-kernel" />
   <project name="device/linaro/bootloader/arm-trusted-firmware" path="device/linaro/bootloader/arm-trusted-firmware" />
   <project name="device/linaro/bootloader/edk2" path="device/linaro/bootloader/edk2" />
   <project name="device/linaro/bootloader/OpenPlatformPkg" path="device/linaro/bootloader/OpenPlatformPkg" />
@@ -123,6 +121,9 @@
   <project groups="pdk" name="platform/external/curl" path="external/curl" />
   <project groups="pdk" name="platform/external/dagger2" path="external/dagger2" />
   <project groups="pdk-fs" name="platform/external/deqp" path="external/deqp" />
+  <project groups="pdk-fs" name="platform/external/deqp-deps/SPIRV-Headers" path="external/deqp-deps/SPIRV-Headers" />
+  <project groups="pdk-fs" name="platform/external/deqp-deps/SPIRV-Tools" path="external/deqp-deps/SPIRV-Tools" />
+  <project groups="pdk-fs" name="platform/external/deqp-deps/glslang" path="external/deqp-deps/glslang" />
   <project groups="pdk" name="platform/external/desugar" path="external/desugar" />
   <project groups="pdk" name="platform/external/dexmaker" path="external/dexmaker" />
   <project groups="pdk" name="platform/external/dlmalloc" path="external/dlmalloc" />
@@ -134,6 +135,7 @@
   <project groups="pdk" name="platform/external/droiddriver" path="external/droiddriver" />
   <project groups="pdk" name="platform/external/drrickorang" path="external/drrickorang" />
   <project groups="pdk" name="platform/external/dtc" path="external/dtc" />
+  <project groups="pdk" name="platform/external/dynamic_depth" path="external/dynamic_depth" />
   <project groups="pdk" name="platform/external/e2fsprogs" path="external/e2fsprogs" />
   <project groups="pdk" name="platform/external/easymock" path="external/easymock" />
   <project groups="pdk" name="platform/external/eigen" path="external/eigen" />
@@ -158,10 +160,16 @@
   <project groups="pdk" name="platform/external/golang-protobuf" path="external/golang-protobuf" />
   <project groups="pdk" name="platform/external/google-benchmark" path="external/google-benchmark" />
   <project groups="pdk-fs" name="platform/external/google-breakpad" path="external/google-breakpad" />
+  <project groups="pdk" name="platform/external/google-fonts/arbutus-slab" path="external/google-fonts/arbutus-slab" />
+  <project groups="pdk" name="platform/external/google-fonts/arvo" path="external/google-fonts/arvo" />
   <project groups="pdk" name="platform/external/google-fonts/carrois-gothic-sc" path="external/google-fonts/carrois-gothic-sc" />
   <project groups="pdk" name="platform/external/google-fonts/coming-soon" path="external/google-fonts/coming-soon" />
   <project groups="pdk" name="platform/external/google-fonts/cutive-mono" path="external/google-fonts/cutive-mono" />
   <project groups="pdk" name="platform/external/google-fonts/dancing-script" path="external/google-fonts/dancing-script" />
+  <project groups="pdk" name="platform/external/google-fonts/lato" path="external/google-fonts/lato" />
+  <project groups="pdk" name="platform/external/google-fonts/source-sans-pro" path="external/google-fonts/source-sans-pro" />
+  <project groups="pdk" name="platform/external/google-fonts/rubik" path="external/google-fonts/rubik" />
+  <project groups="pdk" name="platform/external/google-fonts/zilla-slab" path="external/google-fonts/zilla-slab" />
   <project groups="pdk" name="platform/external/google-fruit" path="external/google-fruit" />
   <project groups="pdk" name="platform/external/google-styleguide" path="external/google-styleguide" />
   <project groups="pdk" name="platform/external/googletest" path="external/googletest" />
@@ -175,8 +183,8 @@
   <project groups="pdk" name="platform/external/honggfuzz" path="external/honggfuzz" />
   <project groups="pdk" name="platform/external/hyphenation-patterns" path="external/hyphenation-patterns" />
   <project groups="pdk" name="platform/external/icu" path="external/icu" />
-  <project groups="pdk" name="platform/external/igt-gpu-tools" path="external/igt-gpu-tools" />
   <project groups="pdk" name="platform/external/ImageMagick" path="external/ImageMagick" />
+  <project groups="pdk" name="platform/external/image_io" path="external/image_io" />
   <project groups="pdk" name="platform/external/ims" path="external/ims" />
   <project groups="pdk" name="platform/external/iperf3" path="external/iperf3" />
   <project groups="pdk" name="platform/external/iproute2" path="external/iproute2" />
@@ -205,6 +213,7 @@
   <project groups="pdk" name="platform/external/kmod" path="external/kmod" />
   <project groups="pdk" name="platform/external/kotlinc" path="external/kotlinc" />
   <project groups="pdk" name="platform/external/ksoap2" path="external/ksoap2" />
+  <project groups="pdk" name="platform/external/libaom" path="external/libaom" />
   <project groups="pdk" name="platform/external/libavc" path="external/libavc" />
   <project groups="pdk" name="platform/external/libbackup" path="external/libbackup" />
   <project groups="pdk" name="platform/external/libbrillo" path="external/libbrillo" />
@@ -279,9 +288,9 @@
   <project groups="pdk" name="platform/external/nfacct" path="external/nfacct" />
   <project groups="pdk" name="platform/external/nist-pkits" path="external/nist-pkits" />
   <project groups="pdk" name="platform/external/nist-sip" path="external/nist-sip" />
-  <project groups="pdk" name="platform/external/nos/host/android" path="external/nos/host/android" />
+  <project groups="pixel" name="platform/external/nos/host/android" path="external/nos/host/android" />
-  <project groups="pdk" name="platform/external/nos/host/generic" path="external/nos/host/generic" />
+  <project groups="pixel" name="platform/external/nos/host/generic" path="external/nos/host/generic" />
-  <project groups="pdk" name="platform/external/nos/test/system-test-harness" path="external/nos/test/system-test-harness" />
+  <project groups="pixel" name="platform/external/nos/test/system-test-harness" path="external/nos/test/system-test-harness" />
   <project groups="pdk" name="platform/external/noto-fonts" path="external/noto-fonts" />
   <project groups="pdk" name="platform/external/oauth" path="external/oauth" />
   <project groups="pdk" name="platform/external/objenesis" path="external/objenesis" />
@@ -289,6 +298,7 @@
   <project groups="pdk" name="platform/external/okhttp" path="external/okhttp" />
   <project groups="pdk" name="platform/external/one-true-awk" path="external/one-true-awk" />
   <project groups="pdk,tradefed" name="platform/external/opencensus-java" path="external/opencensus-java" />
+  <project groups="pdk" name="platform/external/openssh" path="external/openssh" />
   <project groups="pdk" name="platform/external/owasp/sanitizer" path="external/owasp/sanitizer" />
   <project groups="pdk" name="platform/external/parameter-framework" path="external/parameter-framework" />
   <project groups="pdk" name="platform/external/pcre" path="external/pcre" />
@@ -330,7 +340,6 @@
   <project groups="vts,pdk" name="platform/external/python/grpc-google-iam-v1" path="external/python/grpc-google-iam-v1" />
   <project groups="vts,pdk" name="platform/external/python/grpcio" path="external/python/grpcio" />
   <project groups="vts,pdk" name="platform/external/python/httplib2" path="external/python/httplib2" />
-  <project groups="pdk" name="platform/external/python/ipaddress" path="external/python/ipaddress" />
   <project groups="vts,pdk" name="platform/external/python/matplotlib" path="external/python/matplotlib" />
   <project groups="pdk" name="platform/external/python/mock" path="external/python/mock" />
   <project groups="pdk" name="platform/external/python/more-itertools" path="external/python/more-itertools" />
@@ -370,6 +379,8 @@
   <project groups="pdk" name="platform/external/scrypt" path="external/scrypt" />
   <project groups="pdk" name="platform/external/seccomp-tests" path="external/seccomp-tests" />
   <project groups="pdk" name="platform/external/selinux" path="external/selinux" />
+  <project groups="pdk" name="platform/external/setupcompat" path="external/setupcompat" />
+  <project groups="pdk" name="platform/external/setupdesign" path="external/setupdesign" />
   <project groups="pdk,qcom_msm8x26" name="platform/external/sfntly" path="external/sfntly" />
   <project groups="pdk" name="platform/external/shaderc/spirv-headers" path="external/shaderc/spirv-headers" />
   <project groups="pdk" name="platform/external/shflags" path="external/shflags" />
@@ -382,10 +393,12 @@
   <project groups="pdk" name="platform/external/sonic" path="external/sonic" />
   <project groups="pdk" name="platform/external/sonivox" path="external/sonivox" />
   <project groups="pdk" name="platform/external/speex" path="external/speex" />
+  <project groups="pdk" name="platform/external/spirv-llvm" path="external/spirv-llvm" />
   <project groups="pdk" name="platform/external/sqlite" path="external/sqlite" />
   <project groups="pdk" name="platform/external/squashfs-tools" path="external/squashfs-tools" />
   <project groups="pdk" name="platform/external/strace" path="external/strace" />
   <project groups="pdk" name="platform/external/stressapptest" path="external/stressapptest" />
+  <project clone-depth="1" groups="pdk" name="platform/external/subsampling-scale-image-view" path="external/subsampling-scale-image-view" />
   <project groups="pdk" name="platform/external/swiftshader" path="external/swiftshader" />
   <project groups="projectarch,pdk" name="platform/external/syzkaller" path="external/syzkaller" />
   <project groups="pdk" name="platform/external/tagsoup" path="external/tagsoup" />
@@ -427,7 +440,7 @@
   <project groups="pdk" name="platform/external/zlib" path="external/zlib" />
   <project groups="pdk" name="platform/external/zopfli" path="external/zopfli" />
   <project groups="pdk" name="platform/external/zxing" path="external/zxing" />
-  <project groups="pdk" name="platform/frameworks/av" path="frameworks/av" />
+  <project groups="vts,pdk" name="platform/frameworks/av" path="frameworks/av" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/base" path="frameworks/base" />
   <project groups="pdk" name="platform/frameworks/compile/libbcc" path="frameworks/compile/libbcc" />
   <project groups="pdk" name="platform/frameworks/compile/mclinker" path="frameworks/compile/mclinker" />
@@ -447,7 +460,6 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/colorpicker" path="frameworks/opt/colorpicker" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/datetimepicker" path="frameworks/opt/datetimepicker" />
   <project name="platform/frameworks/opt/gamesdk" path="frameworks/opt/gamesdk" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/inputmethodcommon" path="frameworks/opt/inputmethodcommon" />
   <project groups="pdk-fs" name="platform/frameworks/opt/net/ethernet" path="frameworks/opt/net/ethernet" />
   <project groups="pdk" name="platform/frameworks/opt/net/ike" path="frameworks/opt/net/ike" />
   <project groups="frameworks_ims,pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/ims" path="frameworks/opt/net/ims" />
@@ -459,7 +471,6 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/timezonepicker" path="frameworks/opt/timezonepicker" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/vcard" path="frameworks/opt/vcard" />
   <project groups="pdk" name="platform/frameworks/rs" path="frameworks/rs" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/support" path="frameworks/support" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/wilhelm" path="frameworks/wilhelm" />
   <project groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" />
   <project groups="pdk,broadcom_wlan" name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" />
@@ -467,7 +478,7 @@
   <project groups="pdk" name="platform/hardware/google/av" path="hardware/google/av" />
   <project groups="pdk,easel" name="platform/hardware/google/easel" path="hardware/google/easel" />
   <project groups="pdk" name="platform/hardware/google/interfaces" path="hardware/google/interfaces" />
-  <project groups="bonito,crosshatch" name="platform/hardware/google/pixel" path="hardware/google/pixel" />
+  <project groups="pixel" name="platform/hardware/google/pixel" path="hardware/google/pixel" />
   <project groups="pdk" name="platform/hardware/interfaces" path="hardware/interfaces" />
   <project groups="invensense,pdk" name="platform/hardware/invensense" path="hardware/invensense" />
   <project groups="pdk" name="platform/hardware/libhardware" path="hardware/libhardware" />
@@ -493,15 +504,6 @@
   <project groups="qcom_msm8x84,pdk-qcom" name="platform/hardware/qcom/msm8x84" path="hardware/qcom/msm8x84" />
   <project groups="wahoo" name="platform/hardware/qcom/neuralnetworks/hvxservice" path="hardware/qcom/neuralnetworks/hvxservice" />
   <project groups="qcom,pdk-qcom" name="platform/hardware/qcom/power" path="hardware/qcom/power" />
-  <project groups="vendor,qcom_sdm710" name="platform/hardware/qcom/sdm710/data/ipacfg-mgr" path="hardware/qcom/sdm710/data/ipacfg-mgr" />
-  <project groups="qcom_sdm710" name="platform/hardware/qcom/sdm710/display" path="hardware/qcom/sdm710/display">
-    <linkfile dest="hardware/qcom/sdm710/Android.mk" src="os_pickup.mk" />
-    <linkfile dest="hardware/qcom/sdm710/Android.bp" src="os_pickup.bp" />
-  </project>
-  <project groups="qcom_sdm710" name="platform/hardware/qcom/sdm710/gps" path="hardware/qcom/sdm710/gps" />
-  <project groups="qcom_sdm710" name="platform/hardware/qcom/sdm710/media" path="hardware/qcom/sdm710/media" />
-  <project groups="qcom_sdm710" name="platform/hardware/qcom/sdm710/thermal" path="hardware/qcom/sdm710/thermal" />
-  <project groups="qcom_sdm710" name="platform/hardware/qcom/sdm710/vr" path="hardware/qcom/sdm710/vr" />
   <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/bt" path="hardware/qcom/sdm845/bt" />
   <project groups="vendor,qcom_sdm845" name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" path="hardware/qcom/sdm845/data/ipacfg-mgr">
     <linkfile dest="hardware/qcom/sdm845/Android.mk" src="os_pickup.mk" />
@@ -510,16 +512,14 @@
   <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/display" path="hardware/qcom/sdm845/display" />
   <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/gps" path="hardware/qcom/sdm845/gps" />
   <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/media" path="hardware/qcom/sdm845/media" />
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/thermal" path="hardware/qcom/sdm845/thermal" />
+  <project groups="generic_fs,qcom_sdm845" name="platform/hardware/qcom/sdm845/thermal" path="hardware/qcom/sdm845/thermal" />
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/vr" path="hardware/qcom/sdm845/vr" />
+  <project groups="generic_fs,qcom_sdm845" name="platform/hardware/qcom/sdm845/vr" path="hardware/qcom/sdm845/vr" />
   <project groups="qcom_wlan,pdk-qcom" name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" />
   <project groups="pdk" name="platform/hardware/ril" path="hardware/ril" />
-  <project groups="pdk" name="platform/hardware/st/nfc" path="hardware/st/nfc" />
-  <project groups="pdk" name="platform/hardware/st/secure_element" path="hardware/st/secure_element" />
   <project groups="pdk" name="platform/hardware/ti/am57x" path="hardware/ti/am57x" />
   <project name="kernel/build" path="kernel/build" />
   <project groups="vts,pdk" name="kernel/configs" path="kernel/configs" />
-  <project name="kernel/tests" path="kernel/tests" />
+  <project groups="vts,pdk" name="kernel/tests" path="kernel/tests" />
   <project groups="pdk" name="platform/libcore" path="libcore" />
   <project groups="pdk" name="platform/libnativehelper" path="libnativehelper" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/BasicSmsReceiver" path="packages/apps/BasicSmsReceiver" />
@@ -527,12 +527,13 @@
   <project groups="pdk-fs" name="platform/packages/apps/Browser2" path="packages/apps/Browser2" />
   <project groups="pdk-fs" name="platform/packages/apps/Calendar" path="packages/apps/Calendar" />
   <project groups="pdk-fs" name="platform/packages/apps/Camera2" path="packages/apps/Camera2" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/Cluster" path="packages/apps/Car/Cluster" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Dialer" path="packages/apps/Car/Dialer" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Hvac" path="packages/apps/Car/Hvac" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/LatinIME" path="packages/apps/Car/LatinIME" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Launcher" path="packages/apps/Car/Launcher" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/LensPicker" path="packages/apps/Car/LensPicker" />
-  <project groups="pdk-fs" name="platform/packages/apps/Car/libs" path="packages/apps/Car/libs" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/LinkViewer" path="packages/apps/Car/LinkViewer" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/LocalMediaPlayer" path="packages/apps/Car/LocalMediaPlayer" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Media" path="packages/apps/Car/Media" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Messenger" path="packages/apps/Car/Messenger" />
@@ -542,6 +543,9 @@
   <project groups="pdk-fs" name="platform/packages/apps/Car/Settings" path="packages/apps/Car/Settings" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Stream" path="packages/apps/Car/Stream" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/SystemUpdater" path="packages/apps/Car/SystemUpdater" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/externallibs" path="packages/apps/Car/externallibs" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/libs" path="packages/apps/Car/libs" />
+  <project groups="pdk-fs" name="platform/packages/apps/Car/tests" path="packages/apps/Car/tests" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CarrierConfig" path="packages/apps/CarrierConfig" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" />
@@ -556,7 +560,6 @@
   <project groups="pdk-fs" name="platform/packages/apps/Gallery2" path="packages/apps/Gallery2" />
   <project groups="pdk-fs" name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" />
   <project groups="pdk-fs" name="platform/packages/apps/KeyChain" path="packages/apps/KeyChain" />
-  <project groups="pdk-fs" name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" />
   <project groups="pdk-fs" name="platform/packages/apps/Launcher3" path="packages/apps/Launcher3" />
   <project groups="pdk-fs" name="platform/packages/apps/LegacyCamera" path="packages/apps/LegacyCamera" />
   <project groups="pdk-fs" name="platform/packages/apps/ManagedProvisioning" path="packages/apps/ManagedProvisioning" />
@@ -565,12 +568,13 @@
   <project groups="pdk-fs" name="platform/packages/apps/MusicFX" path="packages/apps/MusicFX" />
   <project groups="apps_nfc,pdk-fs" name="platform/packages/apps/Nfc" path="packages/apps/Nfc" />
   <project groups="pdk-fs" name="platform/packages/apps/OneTimeInitializer" path="packages/apps/OneTimeInitializer" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PermissionController" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PhoneCommon" path="packages/apps/PhoneCommon" />
   <project groups="pdk-fs" name="platform/packages/apps/Protips" path="packages/apps/Protips" />
   <project groups="pdk-fs" name="platform/packages/apps/Provision" path="packages/apps/Provision" />
   <project groups="pdk-fs" name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" />
   <project groups="pdk-fs" name="platform/packages/apps/SafetyRegulatoryInfo" path="packages/apps/SafetyRegulatoryInfo" />
+  <project groups="pdk-fs" name="platform/packages/apps/SampleLocationAttribution" path="packages/apps/SampleLocationAttribution" />
   <project groups="apps_se,pdk-fs" name="platform/packages/apps/SecureElement" path="packages/apps/SecureElement" />
   <project groups="pdk-fs" name="platform/packages/apps/Settings" path="packages/apps/Settings" />
   <project groups="pdk-fs" name="platform/packages/apps/SettingsIntelligence" path="packages/apps/SettingsIntelligence" />
@@ -583,13 +587,21 @@
   <project groups="pdk" name="platform/packages/apps/Test/connectivity" path="packages/apps/Test/connectivity" />
   <project groups="pdk" name="platform/packages/apps/TimeZoneData" path="packages/apps/TimeZoneData" />
   <project groups="pdk" name="platform/packages/apps/TimeZoneUpdater" path="packages/apps/TimeZoneUpdater" />
+  <project groups="pdk-fs" name="platform/packages/apps/ThemePicker" path="packages/apps/ThemePicker" />
   <project groups="pdk-fs" name="platform/packages/apps/Traceur" path="packages/apps/Traceur" />
   <project groups="pdk-fs" name="platform/packages/apps/TvSettings" path="packages/apps/TvSettings" />
-  <project name="platform/packages/apps/TV" path="packages/apps/TV" />
+  <project groups="pdk" name="platform/packages/apps/TV" path="packages/apps/TV" />
   <project groups="pdk-fs" name="platform/packages/apps/UnifiedEmail" path="packages/apps/UnifiedEmail" />
+  <project name="platform/packages/apps/UniversalMediaPlayer" path="packages/apps/UniversalMediaPlayer" />
   <project groups="pdk-fs" name="platform/packages/apps/WallpaperPicker" path="packages/apps/WallpaperPicker" />
+  <project groups="pdk-fs" name="platform/packages/apps/WallpaperPicker2" path="packages/apps/WallpaperPicker2" />
   <project groups="pdk-fs" name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/CaptivePortalLogin" path="packages/modules/CaptivePortalLogin" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/ExtServices" path="packages/modules/ExtServices" />
   <project groups="pdk" name="platform/packages/modules/ModuleMetadata" path="packages/modules/ModuleMetadata" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/NetworkPermissionConfig" path="packages/modules/NetworkPermissionConfig" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/NetworkStack" path="packages/modules/NetworkStack" />
+  <project name="platform/packages/modules/TestModule" path="packages/modules/TestModule" />
   <project groups="pdk-fs" name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" />
   <project groups="pdk-fs" name="platform/packages/providers/BlockedNumberProvider" path="packages/providers/BlockedNumberProvider" />
   <project groups="pdk-fs" name="platform/packages/providers/BookmarkProvider" path="packages/providers/BookmarkProvider" />
@@ -604,19 +616,16 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" />
   <project groups="pdk-fs" name="platform/packages/screensavers/Basic" path="packages/screensavers/Basic" />
   <project groups="pdk-fs" name="platform/packages/screensavers/PhotoTable" path="packages/screensavers/PhotoTable" />
-  <project groups="pdk-fs" name="platform/packages/screensavers/WebView" path="packages/screensavers/WebView" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/BuiltInPrintService" path="packages/services/BuiltInPrintService" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/AlternativeNetworkAccess" path="packages/services/AlternativeNetworkAccess" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Car" path="packages/services/Car" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Mms" path="packages/services/Mms" />
-  <project groups="pdk-fs" name="platform/packages/services/NetworkRecommendation" path="packages/services/NetworkRecommendation" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telecomm" path="packages/services/Telecomm" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telephony" path="packages/services/Telephony" />
   <project groups="pdk-fs" name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" />
   <project groups="pdk" name="platform/pdk" path="pdk" />
   <project groups="pdk-fs,pdk-cw-fs,cts" name="platform/platform_testing" path="platform_testing" />
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/abi-dumps/ndk" path="prebuilts/abi-dumps/ndk" />
-  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/abi-dumps/platform" path="prebuilts/abi-dumps/platform" />
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/abi-dumps/vndk" path="prebuilts/abi-dumps/vndk" />
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/android-emulator" path="prebuilts/android-emulator" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/asuite" path="prebuilts/asuite" />
@@ -627,7 +636,6 @@
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" />
   <project clone-depth="1" groups="pdk,darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" />
-  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/deqp" path="prebuilts/deqp" />
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/devtools" path="prebuilts/devtools" />
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/fuchsia_sdk" path="prebuilts/fuchsia_sdk" />
   <project clone-depth="1" groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" />
@@ -645,7 +653,7 @@
   <project clone-depth="1" groups="linux,pdk" name="platform/prebuilts/gdb/linux-x86" path="prebuilts/gdb/linux-x86" />
   <project clone-depth="1" groups="darwin,pdk,tradefed" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" />
   <project clone-depth="1" groups="linux,pdk,tradefed" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" />
-  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" />
+  <project clone-depth="1" groups="pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/manifest-merger" path="prebuilts/manifest-merger" />
@@ -654,7 +662,7 @@
   <project clone-depth="1" name="platform/prebuilts/maven_repo/google-play-service-client-libraries-3p" path="prebuilts/maven_repo/google-play-service-client-libraries-3p" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/misc" path="prebuilts/misc" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" />
-  <project clone-depth="1" name="platform/prebuilts/ktlint" path="prebuilts/ktlint" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/ktlint" path="prebuilts/ktlint" />
   <project clone-depth="1" groups="darwin,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" />
   <project clone-depth="1" groups="linux,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" />
@@ -663,7 +671,9 @@
   <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/vndk/v27" path="prebuilts/vndk/v27" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/vndk/v28" path="prebuilts/vndk/v28" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/sdk" path="sdk" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/sdk" path="sdk">
+    <linkfile dest="frameworks/support/README.md" src="current/androidx-README.md" />
+  </project>
   <project groups="pdk" name="platform/system/apex" path="system/apex" />
   <project groups="pdk" name="platform/system/ashmemd" path="system/ashmemd" />
   <project groups="pdk" name="platform/system/bt" path="system/bt" />
@@ -680,7 +690,6 @@
   <project groups="pdk" name="platform/system/hardware/interfaces" path="system/hardware/interfaces" />
   <project groups="pdk" name="platform/system/hwservicemanager" path="system/hwservicemanager" />
   <project groups="pdk" name="platform/system/iorap" path="system/iorap" />
-  <project groups="pdk" name="platform/system/iot/attestation" path="system/iot/attestation" />
   <project groups="pdk" name="platform/system/keymaster" path="system/keymaster" />
   <project groups="pdk" name="platform/system/libfmq" path="system/libfmq" />
   <project groups="pdk" name="platform/system/libhidl" path="system/libhidl" />
@@ -739,7 +748,7 @@
   <project clone-depth="1" groups="tools" name="platform/tools/external/gradle" path="tools/external/gradle" />
   <project groups="notdefault,tools" name="platform/tools/idea" path="tools/idea" />
   <project groups="nopresubmit,pdk,tradefed" name="platform/tools/loganalysis" path="tools/loganalysis" />
-  <project groups="tools" name="platform/tools/metalava" path="tools/metalava" />
+  <project groups="pdk,tools" name="platform/tools/metalava" path="tools/metalava" />
   <project groups="notdefault,motodev" name="platform/tools/motodev" path="tools/motodev" />
   <project groups="pdk" name="platform/tools/ndkports" path="tools/ndkports" />
   <project groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" />
@@ -750,7 +759,7 @@
   <project groups="pdk" name="platform/tools/test/graphicsbenchmark" path="tools/test/graphicsbenchmark" />
   <project groups="pdk,tradefed" name="platform/tools/tradefederation" path="tools/tradefederation/core" />
   <project groups="pdk,tradefed" name="platform/tools/tradefederation/contrib" path="tools/tradefederation/contrib" />
-  <project groups="tools,cts,pdk-cw-fs,pdk-fs" name="platform/tools/trebuchet" path="tools/trebuchet" />
+  <project groups="tools,cts,pdk,pdk-cw-fs,pdk-fs" name="platform/tools/trebuchet" path="tools/trebuchet" />
 
   <repo-hooks enabled-list="pre-upload" in-project="platform/tools/repohooks" />