diff --git a/default.xml b/default.xml
index e940e81..10dd3e7 100644
--- a/default.xml
+++ b/default.xml
@@ -2,37 +2,40 @@
 <manifest>
 
   <remote  name="aosp"
-           revision="refs/tags/android-9.0.0_r1"
-           fetch="https://android.googlesource.com"/>
+           revision="refs/tags/android-10.0.0_r2"
+           fetch="https://android.googlesource.com"
+           review="android-review.googlesource.com" />
 
   <remote  name="private"
-           fetch="ssh://git@git.aospa.co/AOSPA"/>
+           fetch="ssh://git@git.aospa.co/AOSPA" />
 
   <remote  name="aospa"
            fetch=".."
            review="gerrit.aospa.co"
-           revision="pie"/>
+           revision="quartz" />
 
   <remote  name="caf"
            fetch="git://codeaurora.org/quic/la"
-           review="codeaurora.org"/>
+           review="codeaurora.org" />
 
   <remote  name="blobs"
            fetch="https://github.com/ThankYouMario"
-           revision="pie"/>
+           revision="quartz" />
 
   <remote  name="github"
-           fetch="https://github.com"/>
+           fetch="https://github.com" />
 
   <remote  name="github-ssh"
-           fetch="ssh://git@github.com"/>
+           fetch="ssh://git@github.com" />
 
-  <default revision="refs/tags/LA.UM.7.1.r1-16300-sm8150.0"
+  <default revision="refs/tags/LA.UM.8.1.r1-08700-sm8150.0"
            remote="caf"
            sync-j="4"
            sync-c="true"/>
 
   <project name="abl/tianocore/edk2" path="bootable/bootloader/edk2"/>
+  <project name="device/amlogic/yukawa"/>
+  <project name="device/amlogic/yukawa-kernel"/>
   <project name="device/common"/>
   <project name="device/generic/arm64"/>
   <project name="device/generic/armv7-a-neon"/>
@@ -44,18 +47,21 @@
   <project name="device/generic/mini-emulator-armv7-a-neon"/>
   <project name="device/generic/mini-emulator-x86"/>
   <project name="device/generic/mini-emulator-x86_64"/>
+  <project name="device/generic/opengl-transport"/>
   <project name="device/generic/qemu"/>
+  <project name="device/generic/trusty"/>
   <project name="device/generic/uml"/>
   <project name="device/generic/x86"/>
   <project name="device/generic/x86_64"/>
-  <project name="device/google/accessory/arduino"/>
-  <project name="device/google/accessory/demokit"/>
   <project name="device/google/atv"/>
   <project name="device/google/contexthub"/>
-  <project name="device/google/muskie"/>
-  <project name="device/google/taimen"/>
+  <project name="device/google/cuttlefish"/>
+  <project name="device/google/cuttlefish_common"/>
+  <project name="device/google/cuttlefish_kernel"/>
+  <project name="device/google/cuttlefish_vmm"/>
   <project name="device/google/vrservices"/>
-  <project name="device/google/wahoo"/>
+  <project name="device/linaro/poplar"/>
+  <project name="device/linaro/poplar-kernel"/>
   <project name="device/qcom/common">
     <copyfile dest="build.sh" src="build.sh"/>
     <linkfile dest="vendor/qcom/build/tasks/generate_extra_images.mk" src="generate_extra_images.mk"/>
@@ -67,6 +73,7 @@
   <project name="device/sample"/>
   <project name="kernel/configs"/>
   <project name="kernel/msm-4.14"/>
+  <project name="kernel/tests"/>
   <project name="platform/art" path="art"/>
   <project name="platform/bionic" path="bionic"/>
   <project name="platform/bootable/recovery" path="bootable/recovery"/>
@@ -89,23 +96,23 @@
   <project name="platform/cts" path="cts"/>
   <project name="platform/dalvik" path="dalvik"/>
   <project name="platform/developers/build" path="developers/build"/>
-  <project name="platform/developers/demos" path="developers/demos"/>
-  <project name="platform/developers/samples/android" path="developers/samples/android"/>
   <project name="platform/development" path="development"/>
+  <project name="platform/external/ARMComputeLibrary" path="external/ARMComputeLibrary"/>
   <project name="platform/external/ImageMagick" path="external/ImageMagick"/>
   <project name="platform/external/Microsoft-GSL" path="external/Microsoft-GSL"/>
+  <project name="platform/external/Reactive-Extensions/RxCpp" path="external/Reactive-Extensions/RxCpp"/>
   <project name="platform/external/aac" path="external/aac"/>
-  <project name="platform/external/abi-compliance-checker" path="external/abi-compliance-checker"/>
-  <project name="platform/external/abi-dumper" path="external/abi-dumper"/>
+  <project name="platform/external/adeb" path="external/adeb"/>
   <project name="platform/external/adhd" path="external/adhd"/>
   <project name="platform/external/adt-infra" path="external/adt-infra"/>
   <project name="platform/external/android-clat" path="external/android-clat"/>
   <project name="platform/external/androidplot" path="external/androidplot"/>
-  <project name="platform/external/annotation-tools" path="external/annotation-tools"/>
   <project name="platform/external/ant-glob" path="external/ant-glob"/>
   <project name="platform/external/ant-wireless/ant_native" path="external/ant-wireless/ant_native"/>
   <project name="platform/external/ant-wireless/ant_service" path="external/ant-wireless/ant_service"/>
   <project name="platform/external/antlr" path="external/antlr"/>
+  <project name="platform/external/apache-commons-bcel" path="external/apache-commons-bcel"/>
+  <project name="platform/external/apache-commons-compress" path="external/apache-commons-compress"/>
   <project name="platform/external/apache-commons-math" path="external/apache-commons-math"/>
   <project name="platform/external/apache-harmony" path="external/apache-harmony"/>
   <project name="platform/external/apache-http" path="external/apache-http"/>
@@ -114,7 +121,7 @@
   <project name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines"/>
   <project name="platform/external/autotest" path="external/autotest"/>
   <project name="platform/external/avb" path="external/avb"/>
-  <project name="platform/external/bart" path="external/bart"/>
+  <project name="platform/external/bcc" path="external/bcc"/>
   <project name="platform/external/blktrace" path="external/blktrace"/>
   <project name="platform/external/boringssl" path="external/boringssl"/>
   <project name="platform/external/bouncycastle" path="external/bouncycastle"/>
@@ -123,11 +130,13 @@
   <project name="platform/external/bzip2" path="external/bzip2"/>
   <project name="platform/external/caliper" path="external/caliper"/>
   <project name="platform/external/capstone" path="external/capstone"/>
+  <project name="platform/external/catch2" path="external/catch2"/>
   <project name="platform/external/cblas" path="external/cblas"/>
   <project name="platform/external/chromium-libpac" path="external/chromium-libpac"/>
   <project name="platform/external/chromium-trace" path="external/chromium-trace"/>
   <project name="platform/external/chromium-webview" path="external/chromium-webview"/>
   <project name="platform/external/clang" path="external/clang"/>
+  <project name="platform/external/cldr" path="external/cldr"/>
   <project name="platform/external/cmockery" path="external/cmockery"/>
   <project name="platform/external/cn-cbor" path="external/cn-cbor"/>
   <project name="platform/external/compiler-rt" path="external/compiler-rt"/>
@@ -137,55 +146,61 @@
   <project name="platform/external/curl" path="external/curl"/>
   <project name="platform/external/dagger2" path="external/dagger2"/>
   <project name="platform/external/deqp" path="external/deqp"/>
+  <project name="platform/external/deqp-deps/SPIRV-Headers" path="external/deqp-deps/SPIRV-Headers"/>
+  <project name="platform/external/deqp-deps/SPIRV-Tools" path="external/deqp-deps/SPIRV-Tools"/>
+  <project name="platform/external/deqp-deps/glslang" path="external/deqp-deps/glslang"/>
   <project name="platform/external/desugar" path="external/desugar"/>
-  <project name="platform/external/devlib" path="external/devlib"/>
   <project name="platform/external/dexmaker" path="external/dexmaker"/>
-  <project name="platform/external/dhcpcd-6.8.2" path="external/dhcpcd-6.8.2"/>
   <project name="platform/external/dlmalloc" path="external/dlmalloc"/>
   <project name="platform/external/dng_sdk" path="external/dng_sdk"/>
   <project name="platform/external/dnsmasq" path="external/dnsmasq"/>
   <project name="platform/external/doclava" path="external/doclava"/>
-  <project name="platform/external/donuts" path="external/donuts"/>
-  <project name="platform/external/drm_gralloc" path="external/drm_gralloc"/>
+  <project name="platform/external/dokka" path="external/dokka"/>
   <project name="platform/external/drm_hwcomposer" path="external/drm_hwcomposer"/>
   <project name="platform/external/droiddriver" path="external/droiddriver"/>
   <project name="platform/external/drrickorang" path="external/drrickorang"/>
   <project name="platform/external/dtc" path="external/dtc"/>
+  <project name="platform/external/dynamic_depth" path="external/dynamic_depth"/>
   <project name="platform/external/e2fsprogs" path="external/e2fsprogs"/>
   <project name="platform/external/easymock" path="external/easymock"/>
   <project name="platform/external/eigen" path="external/eigen"/>
   <project name="platform/external/elfutils" path="external/elfutils"/>
   <project name="platform/external/emma" path="external/emma"/>
+  <project name="platform/external/epid-sdk" path="external/epid-sdk"/>
   <project name="platform/external/error_prone" path="external/error_prone"/>
-  <project name="platform/external/esd" path="external/esd"/>
   <project name="platform/external/expat" path="external/expat"/>
-  <project name="platform/external/eyes-free" path="external/eyes-free"/>
   <project name="platform/external/f2fs-tools" path="external/f2fs-tools"/>
   <project name="platform/external/fdlibm" path="external/fdlibm"/>
   <project name="platform/external/fec" path="external/fec"/>
-  <project name="platform/external/fio" path="external/fio"/>
   <project name="platform/external/flac" path="external/flac"/>
   <project name="platform/external/flatbuffers" path="external/flatbuffers"/>
-  <project name="platform/external/fmtlib" path="external/fmtlib"/>
   <project name="platform/external/fonttools" path="external/fonttools"/>
   <project name="platform/external/freetype" path="external/freetype"/>
   <project name="platform/external/fsck_msdos" path="external/fsck_msdos"/>
+  <project name="platform/external/fsverity-utils" path="external/fsverity-utils"/>
   <project name="platform/external/gemmlowp" path="external/gemmlowp"/>
   <project name="platform/external/gflags" path="external/gflags"/>
   <project name="platform/external/giflib" path="external/giflib"/>
   <project name="platform/external/glide" path="external/glide"/>
   <project name="platform/external/golang-protobuf" path="external/golang-protobuf"/>
-  <project name="platform/external/google-api-services-storage" path="external/google-api-services-storage"/>
   <project name="platform/external/google-benchmark" path="external/google-benchmark"/>
   <project name="platform/external/google-breakpad" path="external/google-breakpad"/>
+  <project name="platform/external/google-fonts/arbutus-slab" path="external/google-fonts/arbutus-slab"/>
+  <project name="platform/external/google-fonts/arvo" path="external/google-fonts/arvo"/>
   <project name="platform/external/google-fonts/carrois-gothic-sc" path="external/google-fonts/carrois-gothic-sc"/>
   <project name="platform/external/google-fonts/coming-soon" path="external/google-fonts/coming-soon"/>
   <project name="platform/external/google-fonts/cutive-mono" path="external/google-fonts/cutive-mono"/>
   <project name="platform/external/google-fonts/dancing-script" path="external/google-fonts/dancing-script"/>
+  <project name="platform/external/google-fonts/lato" path="external/google-fonts/lato"/>
+  <project name="platform/external/google-fonts/rubik" path="external/google-fonts/rubik"/>
+  <project name="platform/external/google-fonts/source-sans-pro" path="external/google-fonts/source-sans-pro"/>
+  <project name="platform/external/google-fonts/zilla-slab" path="external/google-fonts/zilla-slab"/>
+  <project name="platform/external/google-fruit" path="external/google-fruit"/>
   <project name="platform/external/google-styleguide" path="external/google-styleguide"/>
-  <project name="platform/external/google-tv-pairing-protocol" path="external/google-tv-pairing-protocol"/>
   <project name="platform/external/googletest" path="external/googletest"/>
   <project name="platform/external/gptfdisk" path="external/gptfdisk"/>
+  <project name="platform/external/grpc-grpc" path="external/grpc-grpc"/>
+  <project name="platform/external/grpc-grpc-java" path="external/grpc-grpc-java"/>
   <project name="platform/external/guava" path="external/guava"/>
   <project name="platform/external/guice" path="external/guice"/>
   <project name="platform/external/hamcrest" path="external/hamcrest"/>
@@ -193,7 +208,9 @@
   <project name="platform/external/honggfuzz" path="external/honggfuzz"/>
   <project name="platform/external/hyphenation-patterns" path="external/hyphenation-patterns"/>
   <project name="platform/external/icu" path="external/icu"/>
+  <project name="platform/external/image_io" path="external/image_io"/>
   <project name="platform/external/ims" path="external/ims"/>
+  <project name="platform/external/iperf3" path="external/iperf3"/>
   <project name="platform/external/iproute2" path="external/iproute2"/>
   <project name="platform/external/ipsec-tools" path="external/ipsec-tools"/>
   <project name="platform/external/iptables" path="external/iptables"/>
@@ -202,13 +219,13 @@
   <project name="platform/external/jacoco" path="external/jacoco"/>
   <project name="platform/external/jarjar" path="external/jarjar"/>
   <project name="platform/external/javaparser" path="external/javaparser"/>
+  <project name="platform/external/javapoet" path="external/javapoet"/>
   <project name="platform/external/javasqlite" path="external/javasqlite"/>
-  <project name="platform/external/javassist" path="external/javassist"/>
   <project name="platform/external/jcommander" path="external/jcommander"/>
   <project name="platform/external/jdiff" path="external/jdiff"/>
   <project name="platform/external/jemalloc" path="external/jemalloc"/>
+  <project name="platform/external/jemalloc_new" path="external/jemalloc_new"/>
   <project name="platform/external/jline" path="external/jline"/>
-  <project name="platform/external/jmdns" path="external/jmdns"/>
   <project name="platform/external/jsilver" path="external/jsilver"/>
   <project name="platform/external/jsmn" path="external/jsmn"/>
   <project name="platform/external/json-c" path="external/json-c"/>
@@ -221,20 +238,19 @@
   <project name="platform/external/kmod" path="external/kmod"/>
   <project name="platform/external/kotlinc" path="external/kotlinc"/>
   <project name="platform/external/ksoap2" path="external/ksoap2"/>
+  <project name="platform/external/libaom" path="external/libaom"/>
   <project name="platform/external/libavc" path="external/libavc"/>
   <project name="platform/external/libbackup" path="external/libbackup"/>
   <project name="platform/external/libbrillo" path="external/libbrillo"/>
   <project name="platform/external/libcap" path="external/libcap"/>
   <project name="platform/external/libcap-ng" path="external/libcap-ng"/>
   <project name="platform/external/libchrome" path="external/libchrome"/>
-  <project name="platform/external/libconstrainedcrypto" path="external/libconstrainedcrypto"/>
   <project name="platform/external/libcups" path="external/libcups"/>
   <project name="platform/external/libcxx" path="external/libcxx"/>
   <project name="platform/external/libcxxabi" path="external/libcxxabi"/>
   <project name="platform/external/libdaemon" path="external/libdaemon"/>
   <project name="platform/external/libdivsufsort" path="external/libdivsufsort"/>
   <project name="platform/external/libdrm" path="external/libdrm"/>
-  <project name="platform/external/libedit" path="external/libedit"/>
   <project name="platform/external/libese" path="external/libese"/>
   <project name="platform/external/libevent" path="external/libevent"/>
   <project name="platform/external/libexif" path="external/libexif"/>
@@ -242,10 +258,8 @@
   <project name="platform/external/libgsm" path="external/libgsm"/>
   <project name="platform/external/libhevc" path="external/libhevc"/>
   <project name="platform/external/libjpeg-turbo" path="external/libjpeg-turbo"/>
+  <project name="platform/external/libkmsxx" path="external/libkmsxx"/>
   <project name="platform/external/libldac" path="external/libldac"/>
-  <project name="platform/external/liblzf" path="external/liblzf"/>
-  <project name="platform/external/libmicrohttpd" path="external/libmicrohttpd"/>
-  <project name="platform/external/libmojo" path="external/libmojo"/>
   <project name="platform/external/libmpeg2" path="external/libmpeg2"/>
   <project name="platform/external/libmtp" path="external/libmtp"/>
   <project name="platform/external/libnetfilter_conntrack" path="external/libnetfilter_conntrack"/>
@@ -256,12 +270,13 @@
   <project name="platform/external/libpcap" path="external/libpcap"/>
   <project name="platform/external/libphonenumber" path="external/libphonenumber"/>
   <project name="platform/external/libpng" path="external/libpng"/>
+  <project name="platform/external/libprotobuf-mutator" path="external/libprotobuf-mutator"/>
   <project name="platform/external/libtextclassifier" path="external/libtextclassifier"/>
   <project name="platform/external/libunwind" path="external/libunwind"/>
   <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm"/>
   <project name="platform/external/libusb" path="external/libusb"/>
   <project name="platform/external/libusb-compat" path="external/libusb-compat"/>
-  <project name="platform/external/libvncserver" path="external/libvncserver"/>
+  <project name="platform/external/libutf" path="external/libutf"/>
   <project name="platform/external/libvpx" path="external/libvpx"/>
   <project name="platform/external/libvterm" path="external/libvterm"/>
   <project name="platform/external/libxaac" path="external/libxaac"/>
@@ -270,21 +285,18 @@
   <project name="platform/external/libxml2" path="external/libxml2"/>
   <project name="platform/external/libyuv" path="external/libyuv"/>
   <project name="platform/external/linux-kselftest" path="external/linux-kselftest"/>
-  <project name="platform/external/lisa" path="external/lisa"/>
-  <project name="platform/external/littlemock" path="external/littlemock"/>
-  <project name="platform/external/lld" path="external/lld"/>
   <project name="platform/external/llvm" path="external/llvm"/>
   <project name="platform/external/lmfit" path="external/lmfit"/>
   <project name="platform/external/ltp" path="external/ltp"/>
+  <project name="platform/external/lua" path="external/lua"/>
   <project name="platform/external/lz4" path="external/lz4"/>
   <project name="platform/external/lzma" path="external/lzma"/>
   <project name="platform/external/markdown" path="external/markdown"/>
   <project name="platform/external/mdnsresponder" path="external/mdnsresponder"/>
   <project name="platform/external/mesa3d" path="external/mesa3d"/>
-  <project name="platform/external/messageformat" path="external/messageformat"/>
+  <project name="platform/external/minigbm" path="external/minigbm"/>
   <project name="platform/external/minijail" path="external/minijail"/>
   <project name="platform/external/mksh" path="external/mksh"/>
-  <project name="platform/external/mmc-utils" path="external/mmc-utils"/>
   <project name="platform/external/mockftpserver" path="external/mockftpserver"/>
   <project name="platform/external/mockito" path="external/mockito"/>
   <project name="platform/external/mockwebserver" path="external/mockwebserver"/>
@@ -294,20 +306,20 @@
   <project name="platform/external/nanohttpd" path="external/nanohttpd"/>
   <project name="platform/external/nanopb-c" path="external/nanopb-c"/>
   <project name="platform/external/naver-fonts" path="external/naver-fonts"/>
-  <project name="platform/external/netcat" path="external/netcat"/>
+  <project name="platform/external/neon_2_sse" path="external/neon_2_sse"/>
   <project name="platform/external/neven" path="external/neven"/>
+  <project name="platform/external/newfs_msdos" path="external/newfs_msdos"/>
   <project name="platform/external/nfacct" path="external/nfacct"/>
   <project name="platform/external/nist-pkits" path="external/nist-pkits"/>
   <project name="platform/external/nist-sip" path="external/nist-sip"/>
-  <project name="platform/external/nos/host/android" path="external/nos/host/android"/>
-  <project name="platform/external/nos/host/generic" path="external/nos/host/generic"/>
-  <project name="platform/external/nos/test/system-test-harness" path="external/nos/test/system-test-harness"/>
   <project name="platform/external/noto-fonts" path="external/noto-fonts"/>
   <project name="platform/external/oauth" path="external/oauth"/>
   <project name="platform/external/objenesis" path="external/objenesis"/>
   <project name="platform/external/oj-libjdwp" path="external/oj-libjdwp"/>
   <project name="platform/external/okhttp" path="external/okhttp"/>
   <project name="platform/external/one-true-awk" path="external/one-true-awk"/>
+  <project name="platform/external/opencensus-java" path="external/opencensus-java"/>
+  <project name="platform/external/openssh" path="external/openssh"/>
   <project name="platform/external/owasp/sanitizer" path="external/owasp/sanitizer"/>
   <project name="platform/external/parameter-framework" path="external/parameter-framework"/>
   <project name="platform/external/pcre" path="external/pcre"/>
@@ -319,15 +331,24 @@
   <project name="platform/external/ppp" path="external/ppp"/>
   <project name="platform/external/proguard" path="external/proguard"/>
   <project name="platform/external/protobuf" path="external/protobuf"/>
+  <project name="platform/external/protobuf-javalite" path="external/protobuf-javalite"/>
   <project name="platform/external/puffin" path="external/puffin"/>
   <project name="platform/external/python/Pillow" path="external/python/Pillow"/>
+  <project name="platform/external/python/apitools" path="external/python/apitools"/>
   <project name="platform/external/python/appdirs" path="external/python/appdirs"/>
+  <project name="platform/external/python/asn1crypto" path="external/python/asn1crypto"/>
+  <project name="platform/external/python/atomicwrites" path="external/python/atomicwrites"/>
+  <project name="platform/external/python/attrs" path="external/python/attrs"/>
   <project name="platform/external/python/cachetools" path="external/python/cachetools"/>
+  <project name="platform/external/python/cffi" path="external/python/cffi"/>
   <project name="platform/external/python/cpython2" path="external/python/cpython2"/>
   <project name="platform/external/python/cpython3" path="external/python/cpython3"/>
+  <project name="platform/external/python/cryptography" path="external/python/cryptography"/>
+  <project name="platform/external/python/dateutil" path="external/python/dateutil"/>
   <project name="platform/external/python/dill" path="external/python/dill"/>
   <project name="platform/external/python/enum" path="external/python/enum"/>
   <project name="platform/external/python/enum34" path="external/python/enum34"/>
+  <project name="platform/external/python/funcsigs" path="external/python/funcsigs"/>
   <project name="platform/external/python/future" path="external/python/future"/>
   <project name="platform/external/python/futures" path="external/python/futures"/>
   <project name="platform/external/python/gapic-google-cloud-pubsub-v1" path="external/python/gapic-google-cloud-pubsub-v1"/>
@@ -342,23 +363,31 @@
   <project name="platform/external/python/grpcio" path="external/python/grpcio"/>
   <project name="platform/external/python/httplib2" path="external/python/httplib2"/>
   <project name="platform/external/python/matplotlib" path="external/python/matplotlib"/>
+  <project name="platform/external/python/mock" path="external/python/mock"/>
+  <project name="platform/external/python/more-itertools" path="external/python/more-itertools"/>
   <project name="platform/external/python/numpy" path="external/python/numpy"/>
   <project name="platform/external/python/oauth2client" path="external/python/oauth2client"/>
   <project name="platform/external/python/olefile" path="external/python/olefile"/>
   <project name="platform/external/python/packaging" path="external/python/packaging"/>
   <project name="platform/external/python/parse" path="external/python/parse"/>
+  <project name="platform/external/python/pluggy" path="external/python/pluggy"/>
   <project name="platform/external/python/ply" path="external/python/ply"/>
   <project name="platform/external/python/proto-google-cloud-pubsub-v1" path="external/python/proto-google-cloud-pubsub-v1"/>
   <project name="platform/external/python/protobuf" path="external/python/protobuf"/>
+  <project name="platform/external/python/py" path="external/python/py"/>
   <project name="platform/external/python/pyasn1" path="external/python/pyasn1"/>
   <project name="platform/external/python/pyasn1-modules" path="external/python/pyasn1-modules"/>
+  <project name="platform/external/python/pycparser" path="external/python/pycparser"/>
+  <project name="platform/external/python/pyopenssl" path="external/python/pyopenssl"/>
   <project name="platform/external/python/pyparsing" path="external/python/pyparsing"/>
+  <project name="platform/external/python/pytest" path="external/python/pytest"/>
   <project name="platform/external/python/requests" path="external/python/requests"/>
   <project name="platform/external/python/rsa" path="external/python/rsa"/>
   <project name="platform/external/python/scipy" path="external/python/scipy"/>
   <project name="platform/external/python/setuptools" path="external/python/setuptools"/>
   <project name="platform/external/python/six" path="external/python/six"/>
   <project name="platform/external/python/uritemplates" path="external/python/uritemplates"/>
+  <project name="platform/external/rapidjson" path="external/rapidjson"/>
   <project name="platform/external/rappor" path="external/rappor"/>
   <project name="platform/external/replicaisland" path="external/replicaisland"/>
   <project name="platform/external/rmi4utils" path="external/rmi4utils"/>
@@ -366,11 +395,12 @@
   <project name="platform/external/robolectric-shadows" path="external/robolectric-shadows"/>
   <project name="platform/external/roboto-fonts" path="external/roboto-fonts"/>
   <project name="platform/external/rootdev" path="external/rootdev"/>
-  <project name="platform/external/safe-iop" path="external/safe-iop"/>
   <project name="platform/external/scapy" path="external/scapy"/>
   <project name="platform/external/scrypt" path="external/scrypt"/>
   <project name="platform/external/seccomp-tests" path="external/seccomp-tests"/>
   <project name="platform/external/selinux" path="external/selinux"/>
+  <project name="platform/external/setupcompat" path="external/setupcompat"/>
+  <project name="platform/external/setupdesign" path="external/setupdesign"/>
   <project name="platform/external/sfntly" path="external/sfntly"/>
   <project name="platform/external/shaderc/spirv-headers" path="external/shaderc/spirv-headers"/>
   <project name="platform/external/shflags" path="external/shflags"/>
@@ -387,45 +417,43 @@
   <project name="platform/external/squashfs-tools" path="external/squashfs-tools"/>
   <project name="platform/external/strace" path="external/strace"/>
   <project name="platform/external/stressapptest" path="external/stressapptest"/>
+  <project name="platform/external/subsampling-scale-image-view" path="external/subsampling-scale-image-view"/>
   <project name="platform/external/swiftshader" path="external/swiftshader"/>
-  <project name="platform/external/syslinux" path="external/syslinux"/>
+  <project name="platform/external/syzkaller" path="external/syzkaller"/>
   <project name="platform/external/tagsoup" path="external/tagsoup"/>
   <project name="platform/external/tcpdump" path="external/tcpdump"/>
   <project name="platform/external/tensorflow" path="external/tensorflow"/>
   <project name="platform/external/testng" path="external/testng"/>
-  <project name="platform/external/timezonepicker-support" path="external/timezonepicker-support"/>
   <project name="platform/external/tinyalsa" path="external/tinyalsa"/>
   <project name="platform/external/tinycompress" path="external/tinycompress"/>
   <project name="platform/external/tinyxml" path="external/tinyxml"/>
   <project name="platform/external/tinyxml2" path="external/tinyxml2"/>
   <project name="platform/external/toybox" path="external/toybox"/>
-  <project name="platform/external/tpm2" path="external/tpm2"/>
-  <project name="platform/external/trappy" path="external/trappy"/>
   <project name="platform/external/tremolo" path="external/tremolo"/>
   <project name="platform/external/turbine" path="external/turbine"/>
+  <project name="platform/external/u-boot" path="external/u-boot"/>
+  <project name="platform/external/ukey2" path="external/ukey2"/>
   <project name="platform/external/unicode" path="external/unicode"/>
-  <project name="platform/external/universal-tween-engine" path="external/universal-tween-engine"/>
   <project name="platform/external/v4l2_codec2" path="external/v4l2_codec2"/>
   <project name="platform/external/v8" path="external/v8"/>
-  <project name="platform/external/valgrind" path="external/valgrind"/>
   <project name="platform/external/vboot_reference" path="external/vboot_reference"/>
+  <project name="platform/external/virglrenderer" path="external/virglrenderer"/>
   <project name="platform/external/vixl" path="external/vixl"/>
   <project name="platform/external/vogar" path="external/vogar"/>
   <project name="platform/external/volley" path="external/volley"/>
+  <project name="platform/external/vulkan-headers" path="external/vulkan-headers"/>
   <project name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers"/>
   <project name="platform/external/walt" path="external/walt"/>
   <project name="platform/external/wayland" path="external/wayland"/>
   <project name="platform/external/wayland-protocols" path="external/wayland-protocols"/>
   <project name="platform/external/webp" path="external/webp"/>
   <project name="platform/external/webrtc" path="external/webrtc"/>
-  <project name="platform/external/webview_support_interfaces" path="external/webview_support_interfaces"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8"/>
   <project name="platform/external/wycheproof" path="external/wycheproof"/>
-  <project name="platform/external/x264" path="external/x264"/>
-  <project name="platform/external/xmlrpcpp" path="external/xmlrpcpp"/>
-  <project name="platform/external/xmlwriter" path="external/xmlwriter"/>
   <project name="platform/external/xmp_toolkit" path="external/xmp_toolkit"/>
   <project name="platform/external/xz-embedded" path="external/xz-embedded"/>
+  <project name="platform/external/xz-java" path="external/xz-java"/>
+  <project name="platform/external/yapf" path="external/yapf"/>
   <project name="platform/external/zlib" path="external/zlib"/>
   <project name="platform/external/zopfli" path="external/zopfli"/>
   <project name="platform/external/zxing" path="external/zxing"/>
@@ -434,7 +462,6 @@
   <project name="platform/frameworks/compile/libbcc" path="frameworks/compile/libbcc"/>
   <project name="platform/frameworks/compile/mclinker" path="frameworks/compile/mclinker"/>
   <project name="platform/frameworks/compile/slang" path="frameworks/compile/slang"/>
-  <project name="platform/frameworks/data-binding" path="frameworks/data-binding"/>
   <project name="platform/frameworks/ex" path="frameworks/ex"/>
   <project name="platform/frameworks/hardware/interfaces" path="frameworks/hardware/interfaces"/>
   <project name="platform/frameworks/layoutlib" path="frameworks/layoutlib"/>
@@ -449,11 +476,9 @@
   <project name="platform/frameworks/opt/chips" path="frameworks/opt/chips"/>
   <project name="platform/frameworks/opt/colorpicker" path="frameworks/opt/colorpicker"/>
   <project name="platform/frameworks/opt/datetimepicker" path="frameworks/opt/datetimepicker"/>
-  <project name="platform/frameworks/opt/inputconnectioncommon" path="frameworks/opt/inputconnectioncommon"/>
-  <project name="platform/frameworks/opt/inputmethodcommon" path="frameworks/opt/inputmethodcommon"/>
   <project name="platform/frameworks/opt/net/ethernet" path="frameworks/opt/net/ethernet"/>
+  <project name="platform/frameworks/opt/net/ike" path="frameworks/opt/net/ike"/>
   <project name="platform/frameworks/opt/net/ims" path="frameworks/opt/net/ims"/>
-  <project name="platform/frameworks/opt/net/lowpan" path="frameworks/opt/net/lowpan"/>
   <project name="platform/frameworks/opt/net/voip" path="frameworks/opt/net/voip"/>
   <project name="platform/frameworks/opt/net/wifi" path="frameworks/opt/net/wifi"/>
   <project name="platform/frameworks/opt/photoviewer" path="frameworks/opt/photoviewer"/>
@@ -462,52 +487,60 @@
   <project name="platform/frameworks/opt/timezonepicker" path="frameworks/opt/timezonepicker"/>
   <project name="platform/frameworks/opt/vcard" path="frameworks/opt/vcard"/>
   <project name="platform/frameworks/rs" path="frameworks/rs"/>
-  <project name="platform/frameworks/support" path="frameworks/support"/>
   <project name="platform/frameworks/wilhelm" path="frameworks/wilhelm"/>
-  <project name="platform/hardware/akm" path="hardware/akm"/>
   <project name="platform/hardware/google/apf" path="hardware/google/apf"/>
   <project name="platform/hardware/google/av" path="hardware/google/av"/>
   <project name="platform/hardware/google/easel" path="hardware/google/easel"/>
   <project name="platform/hardware/google/interfaces" path="hardware/google/interfaces"/>
   <project name="platform/hardware/interfaces" path="hardware/interfaces"/>
-  <project name="platform/hardware/invensense" path="hardware/invensense"/>
   <project name="platform/hardware/libhardware" path="hardware/libhardware"/>
   <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy"/>
   <project name="platform/hardware/nxp/nfc" path="hardware/nxp/nfc"/>
   <project name="platform/hardware/nxp/secure_element" path="hardware/nxp/secure_element"/>
-  <project name="platform/hardware/qcom/audio" path="hardware/qcom/audio"/>
+  <project name="platform/hardware/qcom/audio" path="vendor/qcom/opensource/audio-hal/primary-hal"/>
   <project name="platform/hardware/qcom/bootctrl" path="hardware/qcom/bootctrl"/>
-  <project name="platform/hardware/qcom/bt" path="hardware/qcom/bt"/>
-  <project name="platform/hardware/qcom/display" path="hardware/qcom/display"/>
-  <project name="platform/hardware/qcom/gps" path="hardware/qcom/gps"/>
-  <project name="platform/hardware/qcom/media" path="hardware/qcom/media"/>
+  <project name="platform/hardware/qcom/display" path="hardware/qcom/display">
+    <linkfile dest="vendor/qcom/defs/product-defs/vendor/display-product.mk" src="config/display-product.mk"/>
+    <linkfile dest="vendor/qcom/defs/board-defs/vendor/display-board.mk" src="config/display-board.mk"/>
+  </project>
+  <project name="platform/hardware/qcom/gps" path="hardware/qcom/gps">
+    <linkfile dest="vendor/qcom/defs/product-defs/vendor/gps-product-hal.mk" src="gps_vendor_product.mk"/>
+    <linkfile dest="vendor/qcom/defs/board-defs/vendor/gps-board.mk" src="gps_vendor_board.mk"/>
+  </project>
+  <project name="platform/hardware/qcom/media" path="hardware/qcom/media">
+    <linkfile dest="vendor/qcom/defs/product-defs/vendor/video-product.mk" src="product.mk"/>
+  </project>
   <project name="platform/hardware/qcom/thermal" path="vendor/qcom/opensource/thermal-hal"/>
   <project name="platform/hardware/qcom/vr" path="hardware/qcom/vr"/>
   <project name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan"/>
   <project name="platform/hardware/ril" path="hardware/ril"/>
+  <project name="platform/hardware/ti/am57x" path="hardware/ti/am57x"/>
   <project name="platform/libcore" path="libcore"/>
   <project name="platform/libnativehelper" path="libnativehelper"/>
   <project name="platform/packages/apps/BasicSmsReceiver" path="packages/apps/BasicSmsReceiver"/>
   <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth"/>
   <project name="platform/packages/apps/Browser2" path="packages/apps/Browser2"/>
-  <project name="platform/packages/apps/CMFileManager" path="packages/apps/CMFileManager"/>
   <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar"/>
   <project name="platform/packages/apps/Camera2" path="packages/apps/Camera2"/>
+  <project name="platform/packages/apps/Car/Cluster" path="packages/apps/Car/Cluster"/>
   <project name="platform/packages/apps/Car/Dialer" path="packages/apps/Car/Dialer"/>
   <project name="platform/packages/apps/Car/Hvac" path="packages/apps/Car/Hvac"/>
   <project name="platform/packages/apps/Car/LatinIME" path="packages/apps/Car/LatinIME"/>
   <project name="platform/packages/apps/Car/Launcher" path="packages/apps/Car/Launcher"/>
   <project name="platform/packages/apps/Car/LensPicker" path="packages/apps/Car/LensPicker"/>
+  <project name="platform/packages/apps/Car/LinkViewer" path="packages/apps/Car/LinkViewer"/>
   <project name="platform/packages/apps/Car/LocalMediaPlayer" path="packages/apps/Car/LocalMediaPlayer"/>
   <project name="platform/packages/apps/Car/Media" path="packages/apps/Car/Media"/>
   <project name="platform/packages/apps/Car/Messenger" path="packages/apps/Car/Messenger"/>
+  <project name="platform/packages/apps/Car/Notification" path="packages/apps/Car/Notification"/>
   <project name="platform/packages/apps/Car/Overview" path="packages/apps/Car/Overview"/>
   <project name="platform/packages/apps/Car/Radio" path="packages/apps/Car/Radio"/>
   <project name="platform/packages/apps/Car/Settings" path="packages/apps/Car/Settings"/>
   <project name="platform/packages/apps/Car/Stream" path="packages/apps/Car/Stream"/>
   <project name="platform/packages/apps/Car/SystemUpdater" path="packages/apps/Car/SystemUpdater"/>
-  <project name="platform/packages/apps/Car/UserManagement" path="packages/apps/Car/UserManagement"/>
+  <project name="platform/packages/apps/Car/externallibs" path="packages/apps/Car/externallibs"/>
   <project name="platform/packages/apps/Car/libs" path="packages/apps/Car/libs"/>
+  <project name="platform/packages/apps/Car/tests" path="packages/apps/Car/tests"/>
   <project name="platform/packages/apps/CarrierConfig" path="packages/apps/CarrierConfig"/>
   <project name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver"/>
   <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller"/>
@@ -518,34 +551,38 @@
   <project name="platform/packages/apps/DocumentsUI" path="packages/apps/DocumentsUI"/>
   <project name="platform/packages/apps/Email" path="packages/apps/Email"/>
   <project name="platform/packages/apps/EmergencyInfo" path="packages/apps/EmergencyInfo"/>
-  <project name="platform/packages/apps/ExactCalculator" path="packages/apps/ExactCalculator"/>
   <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery"/>
   <project name="platform/packages/apps/Gallery2" path="packages/apps/Gallery2"/>
   <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer"/>
   <project name="platform/packages/apps/KeyChain" path="packages/apps/KeyChain"/>
-  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2"/>
   <project name="platform/packages/apps/Launcher3" path="packages/apps/Launcher3"/>
   <project name="platform/packages/apps/LegacyCamera" path="packages/apps/LegacyCamera"/>
   <project name="platform/packages/apps/ManagedProvisioning" path="packages/apps/ManagedProvisioning"/>
   <project name="platform/packages/apps/Messaging" path="packages/apps/Messaging"/>
-  <project name="platform/packages/apps/Mms" path="packages/apps/Mms"/>
+  <project name="platform/packages/apps/Mms" path="vendor/codeaurora/commonsys/packages/apps/Mms">
+    <linkfile dest="vendor/qcom/defs/product-defs/system/app_mms_product.mk" src="app_mms_system_product.mk"/>
+  </project>
   <project name="platform/packages/apps/Music" path="packages/apps/Music"/>
   <project name="platform/packages/apps/MusicFX" path="packages/apps/MusicFX"/>
   <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc"/>
   <project name="platform/packages/apps/OneTimeInitializer" path="packages/apps/OneTimeInitializer"/>
-  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller"/>
+  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PermissionController"/>
   <project name="platform/packages/apps/PhoneCommon" path="packages/apps/PhoneCommon"/>
   <project name="platform/packages/apps/Protips" path="packages/apps/Protips"/>
   <project name="platform/packages/apps/Provision" path="packages/apps/Provision"/>
   <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox"/>
   <project name="platform/packages/apps/SafetyRegulatoryInfo" path="packages/apps/SafetyRegulatoryInfo"/>
+  <project name="platform/packages/apps/SampleLocationAttribution" path="packages/apps/SampleLocationAttribution"/>
   <project name="platform/packages/apps/SecureElement" path="packages/apps/SecureElement"/>
   <project name="platform/packages/apps/Settings" path="packages/apps/Settings"/>
   <project name="platform/packages/apps/SettingsIntelligence" path="packages/apps/SettingsIntelligence"/>
-  <project name="platform/packages/apps/SmartCardService" path="packages/apps/SmartCardService"/>
-  <project name="platform/packages/apps/SnapdragonCamera" path="packages/apps/SnapdragonCamera"/>
+  <project name="platform/packages/apps/SnapdragonCamera" path="packages/apps/SnapdragonCamera">
+    <linkfile dest="vendor/qcom/defs/product-defs/system/app_snapcam_system_product.mk" src="app_snapcam_system_product.mk"/>
+  </project>
   <project name="platform/packages/apps/SnapdragonGallery" path="packages/apps/SnapdragonGallery"/>
-  <project name="platform/packages/apps/SnapdragonMusic" path="packages/apps/SnapdragonMusic"/>
+  <project name="platform/packages/apps/SnapdragonMusic" path="vendor/codeaurora/commonsys/packages/apps/SnapdragonMusic">
+    <linkfile dest="vendor/qcom/defs/product-defs/system/app_snapMusic_product.mk" src="app_snapMusic_system_product.mk"/>
+  </project>
   <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder"/>
   <project name="platform/packages/apps/SpareParts" path="packages/apps/SpareParts"/>
   <project name="platform/packages/apps/Stk" path="packages/apps/Stk"/>
@@ -554,15 +591,20 @@
   <project name="platform/packages/apps/Tag" path="packages/apps/Tag"/>
   <project name="platform/packages/apps/Terminal" path="packages/apps/Terminal"/>
   <project name="platform/packages/apps/Test/connectivity" path="packages/apps/Test/connectivity"/>
+  <project name="platform/packages/apps/ThemePicker" path="packages/apps/ThemePicker"/>
   <project name="platform/packages/apps/TimeZoneData" path="packages/apps/TimeZoneData"/>
   <project name="platform/packages/apps/TimeZoneUpdater" path="packages/apps/TimeZoneUpdater"/>
   <project name="platform/packages/apps/Traceur" path="packages/apps/Traceur"/>
   <project name="platform/packages/apps/TvSettings" path="packages/apps/TvSettings"/>
   <project name="platform/packages/apps/UnifiedEmail" path="packages/apps/UnifiedEmail"/>
   <project name="platform/packages/apps/WallpaperPicker" path="packages/apps/WallpaperPicker"/>
-  <project name="platform/packages/experimental" path="packages/experimental"/>
+  <project name="platform/packages/apps/WallpaperPicker2" path="packages/apps/WallpaperPicker2"/>
   <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME"/>
-  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn"/>
+  <project name="platform/packages/modules/CaptivePortalLogin" path="packages/modules/CaptivePortalLogin"/>
+  <project name="platform/packages/modules/ExtServices" path="packages/modules/ExtServices"/>
+  <project name="platform/packages/modules/ModuleMetadata" path="packages/modules/ModuleMetadata"/>
+  <project name="platform/packages/modules/NetworkPermissionConfig" path="packages/modules/NetworkPermissionConfig"/>
+  <project name="platform/packages/modules/NetworkStack" path="packages/modules/NetworkStack"/>
   <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider"/>
   <project name="platform/packages/providers/BlockedNumberProvider" path="packages/providers/BlockedNumberProvider"/>
   <project name="platform/packages/providers/BookmarkProvider" path="packages/providers/BookmarkProvider"/>
@@ -577,12 +619,10 @@
   <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider"/>
   <project name="platform/packages/screensavers/Basic" path="packages/screensavers/Basic"/>
   <project name="platform/packages/screensavers/PhotoTable" path="packages/screensavers/PhotoTable"/>
-  <project name="platform/packages/screensavers/WebView" path="packages/screensavers/WebView"/>
+  <project name="platform/packages/services/AlternativeNetworkAccess" path="packages/services/AlternativeNetworkAccess"/>
   <project name="platform/packages/services/BuiltInPrintService" path="packages/services/BuiltInPrintService"/>
   <project name="platform/packages/services/Car" path="packages/services/Car"/>
   <project name="platform/packages/services/Mms" path="packages/services/Mms"/>
-  <project name="platform/packages/services/NetworkRecommendation" path="packages/services/NetworkRecommendation"/>
-  <project name="platform/packages/services/Rcs" path="packages/services/Rcs"/>
   <project name="platform/packages/services/Telecomm" path="packages/services/Telecomm"/>
   <project name="platform/packages/services/Telephony" path="packages/services/Telephony"/>
   <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker"/>
@@ -591,16 +631,19 @@
   <project name="platform/prebuilts/abi-dumps/ndk" path="prebuilts/abi-dumps/ndk"/>
   <project name="platform/prebuilts/abi-dumps/vndk" path="prebuilts/abi-dumps/vndk"/>
   <project name="platform/prebuilts/android-emulator" path="prebuilts/android-emulator"/>
+  <project name="platform/prebuilts/asuite" path="prebuilts/asuite"/>
   <project name="platform/prebuilts/build-tools" path="prebuilts/build-tools"/>
+  <project name="platform/prebuilts/bundletool" path="prebuilts/bundletool"/>
   <project name="platform/prebuilts/checkcolor" path="prebuilts/checkcolor"/>
   <project name="platform/prebuilts/checkstyle" path="prebuilts/checkstyle"/>
   <project name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools"/>
   <project name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86"/>
-  <project name="platform/prebuilts/deqp" path="prebuilts/deqp"/>
   <project name="platform/prebuilts/devtools" path="prebuilts/devtools"/>
+  <project name="platform/prebuilts/fuchsia_sdk" path="prebuilts/fuchsia_sdk"/>
   <project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9"/>
+  <project name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8"/>
   <project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9"/>
-  <project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8"/>
+  <project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8"/>
   <project name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8"/>
   <project name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9"/>
   <project name="platform/prebuilts/gdb/linux-x86" path="prebuilts/gdb/linux-x86"/>
@@ -608,7 +651,8 @@
   <project name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin"/>
   <project name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8"/>
   <project name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9"/>
-  <project name="platform/prebuilts/libs/libedit" path="prebuilts/libs/libedit"/>
+  <project name="platform/prebuilts/ktlint" path="prebuilts/ktlint"/>
+  <project name="platform/prebuilts/manifest-merger" path="prebuilts/manifest-merger"/>
   <project name="platform/prebuilts/maven_repo/android" path="prebuilts/maven_repo/android"/>
   <project name="platform/prebuilts/maven_repo/bumptech" path="prebuilts/maven_repo/bumptech"/>
   <project name="platform/prebuilts/misc" path="prebuilts/misc"/>
@@ -619,7 +663,14 @@
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk"/>
   <project name="platform/prebuilts/tools" path="prebuilts/tools"/>
   <project name="platform/prebuilts/vndk/v27" path="prebuilts/vndk/v27"/>
-  <project name="platform/sdk" path="sdk"/>
+  <project name="platform/prebuilts/vndk/v28" path="prebuilts/vndk/v28"/>
+  <project name="platform/sdk" path="sdk">
+    <linkfile dest="frameworks/support/README.md" src="current/androidx-README.md"/>
+  </project>
+  <project name="platform/system/apex" path="system/apex"/>
+  <project name="platform/system/ashmemd" path="system/ashmemd"/>
+  <project name="platform/system/bpf" path="system/bpf"/>
+  <project name="platform/system/bpfprogs" path="system/bpfprogs"/>
   <project name="platform/system/bt" path="system/bt"/>
   <project name="platform/system/ca-certificates" path="system/ca-certificates"/>
   <project name="platform/system/chre" path="system/chre"/>
@@ -628,15 +679,18 @@
   <project name="platform/system/core" path="system/core"/>
   <project name="platform/system/extras" path="system/extras"/>
   <project name="platform/system/gatekeeper" path="system/gatekeeper"/>
+  <project name="platform/system/gsid" path="system/gsid"/>
   <project name="platform/system/hardware/interfaces" path="system/hardware/interfaces"/>
   <project name="platform/system/hwservicemanager" path="system/hwservicemanager"/>
-  <project name="platform/system/iot/attestation" path="system/iot/attestation"/>
+  <project name="platform/system/iorap" path="system/iorap"/>
   <project name="platform/system/keymaster" path="system/keymaster"/>
   <project name="platform/system/libfmq" path="system/libfmq"/>
   <project name="platform/system/libhidl" path="system/libhidl"/>
   <project name="platform/system/libhwbinder" path="system/libhwbinder"/>
+  <project name="platform/system/libsysprop" path="system/libsysprop"/>
   <project name="platform/system/libufdt" path="system/libufdt"/>
   <project name="platform/system/libvintf" path="system/libvintf"/>
+  <project name="platform/system/linkerconfig" path="system/linkerconfig"/>
   <project name="platform/system/media" path="system/media"/>
   <project name="platform/system/netd" path="system/netd"/>
   <project name="platform/system/nfc" path="system/nfc"/>
@@ -644,13 +698,19 @@
   <project name="platform/system/qcom" path="vendor/qcom/opensource/softap"/>
   <project name="platform/system/security" path="system/security"/>
   <project name="platform/system/sepolicy" path="system/sepolicy"/>
+  <project name="platform/system/server_configurable_flags" path="system/server_configurable_flags"/>
+  <project name="platform/system/testing/gtest_extras" path="system/testing/gtest_extras"/>
   <project name="platform/system/timezone" path="system/timezone"/>
   <project name="platform/system/tools/aidl" path="system/tools/aidl"/>
   <project name="platform/system/tools/hidl" path="system/tools/hidl"/>
-  <project name="platform/system/tpm" path="system/tpm"/>
+  <project name="platform/system/tools/sysprop" path="system/tools/sysprop"/>
+  <project name="platform/system/tools/xsdc" path="system/tools/xsdc"/>
+  <project name="platform/system/ucontainer" path="system/ucontainer"/>
   <project name="platform/system/update_engine" path="system/update_engine"/>
   <project name="platform/system/vold" path="system/vold"/>
   <project name="platform/test/framework" path="test/framework"/>
+  <project name="platform/test/mlts/benchmark" path="test/mlts/benchmark"/>
+  <project name="platform/test/mlts/models" path="test/mlts/models"/>
   <project name="platform/test/suite_harness" path="test/suite_harness"/>
   <project name="platform/test/vti/alert" path="test/vti/alert"/>
   <project name="platform/test/vti/dashboard" path="test/vti/dashboard"/>
@@ -668,47 +728,75 @@
   <project name="platform/tools/acloud" path="tools/acloud"/>
   <project name="platform/tools/apksig" path="tools/apksig"/>
   <project name="platform/tools/apkzlib" path="tools/apkzlib"/>
+  <project name="platform/tools/asuite" path="tools/asuite"/>
+  <project name="platform/tools/currysrc" path="tools/currysrc"/>
   <project name="platform/tools/dexter" path="tools/dexter"/>
-  <project name="platform/tools/external/fat32lib" path="tools/external/fat32lib"/>
-  <project name="platform/tools/external/gradle" path="tools/external/gradle"/>
   <project name="platform/tools/loganalysis" path="tools/loganalysis"/>
   <project name="platform/tools/metalava" path="tools/metalava"/>
+  <project name="platform/tools/ndkports" path="tools/ndkports"/>
   <project name="platform/tools/repohooks" path="tools/repohooks"/>
+  <project name="platform/tools/security" path="tools/security"/>
   <project name="platform/tools/test/connectivity" path="tools/test/connectivity"/>
+  <project name="platform/tools/test/graphicsbenchmark" path="tools/test/graphicsbenchmark"/>
   <project name="platform/tools/tradefederation" path="tools/tradefederation/core"/>
   <project name="platform/tools/tradefederation/contrib" path="tools/tradefederation/contrib"/>
+  <project name="platform/tools/trebuchet" path="tools/trebuchet"/>
   <project name="platform/vendor/codeaurora/packages/apps/Dialer" path="vendor/codeaurora/commonsys/packages/apps/Dialer"/>
+  <project name="platform/vendor/codeaurora/packages/apps/SoundRecorder" path="vendor/codeaurora/commonsys/packages/apps/SoundRecorder">
+    <linkfile dest="vendor/qcom/defs/product-defs/system/app_qtiSoundRecorder_product.mk" src="app_qtiSoundRecorder_system_product.mk"/>
+  </project>
   <project name="platform/vendor/codeaurora/telephony" path="vendor/codeaurora/commonsys/telephony"/>
-  <project name="platform/vendor/google_easel" path="vendor/google_easel"/>
   <project name="platform/vendor/nxp/interfaces/opensource/nfc" path="vendor/nxp/opensource/interfaces/nfc"/>
   <project name="platform/vendor/nxp/opensource/external/libnfc-nci" path="vendor/nxp/opensource/commonsys/external/libnfc-nci"/>
   <project name="platform/vendor/nxp/opensource/frameworks" path="vendor/nxp/opensource/commonsys/frameworks"/>
-  <project name="platform/vendor/nxp/opensource/halimpl" path="vendor/nxp/opensource/halimpl"/>
+  <project name="platform/vendor/nxp/opensource/halimpl" path="vendor/nxp/opensource/halimpl">
+    <linkfile dest="vendor/qcom/defs/product-defs/vendor/nfc-vendor-product.mk" src="nfc_vendor_product.mk"/>
+  </project>
   <project name="platform/vendor/nxp/opensource/hidlimpl" path="vendor/nxp/opensource/hidlimpl"/>
-  <project name="platform/vendor/nxp/opensource/packages/apps/Nfc" path="vendor/nxp/opensource/commonsys/packages/apps/Nfc"/>
-  <project name="platform/vendor/opensource/audio-kernel" path="kernel/msm-4.9/techpack/audio"/>
+  <project name="platform/vendor/nxp/opensource/packages/apps/Nfc" path="vendor/nxp/opensource/commonsys/packages/apps/Nfc">
+    <linkfile dest="vendor/qcom/defs/product-defs/system/nfc-system-product.mk" src="nfc_system_product.mk"/>
+  </project>
+  <project name="platform/vendor/opensource/audio-kernel" path="vendor/qcom/opensource/audio-kernel"/>
   <project name="platform/vendor/qcom-opensource/audio" path="vendor/qcom/opensource/audio"/>
+  <project name="platform/vendor/qcom-opensource/audio-hal/st-hal" path="vendor/qcom/opensource/audio-hal/st-hal"/>
   <project name="platform/vendor/qcom-opensource/bluetooth" path="vendor/qcom/opensource/commonsys/bluetooth"/>
+  <project name="platform/vendor/qcom-opensource/bluetooth-commonsys-intf" path="vendor/qcom/opensource/commonsys-intf/bluetooth">
+    <linkfile dest="vendor/qcom/defs/board-defs/system/bt-commonsys-intf-board.mk" src="bt-commonsys-intf-board.mk"/>
+    <linkfile dest="vendor/qcom/defs/board-defs/vendor/bt-commonsys-intf-board.mk" src="bt-commonsys-intf-board.mk"/>
+    <linkfile dest="vendor/qcom/defs/product-defs/system/bt-system-opensource-product.mk" src="bt-system-opensource-product.mk"/>
+  </project>
   <project name="platform/vendor/qcom-opensource/bluetooth_ext" path="vendor/qcom/opensource/commonsys/bluetooth_ext"/>
   <project name="platform/vendor/qcom-opensource/core-utils" path="vendor/qcom/opensource/core-utils">
     <linkfile dest="vendor/qcom/build/tasks/QSSI_violators.mk" src="build/QSSI_violators.mk"/>
+    <linkfile dest="vendor/qcom/build/tasks/QMAA_enforcement.mk" src="build/QMAA_enforcement.mk"/>
+    <linkfile dest="build.sh" src="build/build.sh"/>
   </project>
   <project name="platform/vendor/qcom-opensource/cryptfs_hw" path="vendor/qcom/opensource/commonsys/cryptfs_hw"/>
-  <project name="platform/vendor/qcom-opensource/data-ipa-cfg-mgr" path="vendor/qcom/opensource/data-ipa-cfg-mgr"/>
-  <project name="platform/vendor/qcom-opensource/data-kernel" path="vendor/qcom/opensource/data-kernel"/>
+  <project name="platform/vendor/qcom-opensource/data-ipa-cfg-mgr" path="vendor/qcom/opensource/data-ipa-cfg-mgr">
+    <linkfile dest="vendor/qcom/defs/product-defs/vendor/ipacm_vendor_product.mk" src="ipacm_vendor_product.mk"/>
+  </project>
+  <project name="platform/vendor/qcom-opensource/data-kernel" path="vendor/qcom/opensource/data-kernel">
+    <linkfile dest="vendor/qcom/defs/board-defs/vendor/data_dlkm_vendor_board.mk" src="data_dlkm_vendor_board.mk"/>
+  </project>
   <project name="platform/vendor/qcom-opensource/dataservices" path="vendor/qcom/opensource/dataservices"/>
   <project name="platform/vendor/qcom-opensource/dataservices-commonsys" path="vendor/qcom/opensource/commonsys/dataservices"/>
-  <project name="platform/vendor/qcom-opensource/display-commonsys-intf" path="vendor/qcom/opensource/commonsys-intf/display"/>
+  <project name="platform/vendor/qcom-opensource/display-commonsys-intf" path="vendor/qcom/opensource/commonsys-intf/display">
+    <linkfile dest="vendor/qcom/defs/product-defs/system/display-product-system.mk" src="config/display-product-system.mk"/>
+  </project>
   <project name="platform/vendor/qcom-opensource/dpm" path="vendor/qcom/opensource/dpm"/>
   <project name="platform/vendor/qcom-opensource/dpm-commonsys" path="vendor/qcom/opensource/commonsys/dpm"/>
-  <project name="platform/vendor/qcom-opensource/fm" path="vendor/qcom/opensource/fm"/>
   <project name="platform/vendor/qcom-opensource/fm-commonsys" path="vendor/qcom/opensource/commonsys/fm"/>
   <project name="platform/vendor/qcom-opensource/fst-manager" path="vendor/qcom/opensource/fst-manager"/>
   <project name="platform/vendor/qcom-opensource/healthd-ext" path="vendor/qcom/opensource/healthd-ext"/>
   <project name="platform/vendor/qcom-opensource/interfaces" path="vendor/qcom/opensource/interfaces"/>
-  <project name="platform/vendor/qcom-opensource/location" path="vendor/qcom/opensource/location"/>
+  <project name="platform/vendor/qcom-opensource/location" path="vendor/qcom/opensource/location">
+    <linkfile dest="vendor/qcom/defs/product-defs/vendor/gps-product-opensource.mk" src="gps_vendor_product.mk"/>
+  </project>
   <project name="platform/vendor/qcom-opensource/mmc-utils" path="vendor/qcom/opensource/mmc-utils"/>
-  <project name="platform/vendor/qcom-opensource/power" path="vendor/qcom/opensource/power"/>
+  <project name="platform/vendor/qcom-opensource/power" path="vendor/qcom/opensource/power">
+    <linkfile dest="vendor/qcom/defs/product-defs/vendor/power-vendor-product.mk" src="power-vendor-product.mk"/>
+    <linkfile dest="vendor/qcom/defs/board-defs/vendor/power-vendor-board.mk" src="power-vendor-board.mk"/>
+  </project>
   <project name="platform/vendor/qcom-opensource/recovery-ext" path="vendor/qcom/opensource/recovery-ext"/>
   <project name="platform/vendor/qcom-opensource/shortcut-fe" path="shortcut-fe"/>
   <project name="platform/vendor/qcom-opensource/system/bt" path="vendor/qcom/opensource/commonsys/system/bt"/>
@@ -717,7 +805,7 @@
   <project name="platform/vendor/qcom-opensource/tools" path="vendor/qcom/opensource/tools"/>
   <project name="platform/vendor/qcom-opensource/usb" path="vendor/qcom/opensource/usb"/>
   <project name="platform/vendor/qcom-opensource/vibrator" path="vendor/qcom/opensource/vibrator"/>
-  <project name="platform/vendor/qcom-opensource/wfd-commonsys" path="vendor/qcom/opensource/commonsys/wfd"/>
+  <project name="platform/vendor/qcom-opensource/wfd-commonsys" path="vendor/qcom/opensource/commonsys-intf/wfd"/>
   <project name="platform/vendor/qcom-opensource/wigig" path="vendor/qcom/opensource/wigig"/>
   <project name="platform/vendor/qcom-opensource/wlan/fw-api" path="vendor/qcom/opensource/wlan/fw-api"/>
   <project name="platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn" path="vendor/qcom/opensource/wlan/qca-wifi-host-cmn"/>
@@ -727,9 +815,9 @@
   <project name="platform/vendor/qcom/msm8909go" path="device/qcom/msm8909go"/>
   <project name="platform/vendor/qcom/msmnile" path="device/qcom/msmnile"/>
   <project name="platform/vendor/qcom/skunk" path="device/qcom/sdm845"/>
+  <project name="platform/vendor/qcom/steppe" path="device/qcom/sm6150"/>
   <project name="platform/vendor/qcom/thulium" path="device/qcom/msm8996"/>
   <project name="platform/vendor/qcom/wlan" path="device/qcom/wlan"/>
-  <project name="toolchain/binutils"/>
   <project name="toolchain/pgo-profiles"/>
 
   <!-- Paranoid Android additions -->
diff --git a/manifests/aospa.xml b/manifests/aospa.xml
index 384e7d4..25573b7 100644
--- a/manifests/aospa.xml
+++ b/manifests/aospa.xml
@@ -20,9 +20,7 @@
     <linkfile src="root.bp" dest="Android.bp" />
     <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
   </project>
-  <project path="vendor/qcom/sdclang-3.9/linux-x86" name="proprietary_vendor_qcom_sdclang-3.9_linux-x86" remote="blobs" revision="pie" />
-  <project path="vendor/qcom/sdclang-4.0/linux-x86" name="proprietary_vendor_qcom_sdclang-4.0_linux-x86" remote="blobs" revision="pie" />
-  <project path="vendor/qcom/sdclang-6.0/linux-x86" name="proprietary_vendor_qcom_sdclang-6.0_linux-x86" remote="blobs" revision="pie" />
+  <project path="vendor/qcom/sdclang-8.0/linux-x86" name="proprietary_vendor_qcom_sdclang-8.0_linux-x86" remote="blobs" revision="quartz" />
 
   <!-- Hardware -->
   <remove-project name="device/qcom/common" />
diff --git a/readme.md b/readme.md
index fead86a..1f7e0e4 100644
--- a/readme.md
+++ b/readme.md
@@ -41,7 +41,7 @@ $ cd WORKSPACE
 
 # Install Repo in the created directory
 # Use a real name/email combination, if you intend to submit patches
-$ repo init -u https://github.com/AOSPA/manifest -b pie
+$ repo init -u https://github.com/AOSPA/manifest -b quartz
 ```
 
 ### Downloading the source tree ###
@@ -140,23 +140,23 @@ $ git add -A
 $ git commit -a -s
 
 # Upload your changes
-$ git push ssh://USERNAME@gerrit.aospa.co:29418/AOSPA/PROJECT HEAD:refs/for/pie
+$ git push ssh://USERNAME@gerrit.aospa.co:29418/AOSPA/PROJECT HEAD:refs/for/quartz
 ```
 
 ### Extra commands for Gerrit ###
 
 ```bash
 # If you desire to upload a change as private use the below command
-$ git push ssh://USERNAME@gerrit.aospa.co:29418/AOSPA/PROJECT HEAD:refs/for/pie%private
+$ git push ssh://USERNAME@gerrit.aospa.co:29418/AOSPA/PROJECT HEAD:refs/for/quartz%private
 
 # If you desire to upload a change as W.I.P(Work in Progress) use the below command
-$ git push ssh://USERNAME@gerrit.aospa.co:29418/AOSPA/PROJECT HEAD:refs/for/pie%wip
+$ git push ssh://USERNAME@gerrit.aospa.co:29418/AOSPA/PROJECT HEAD:refs/for/quartz%wip
 
 # After that, if you want to make the commit public you can use the UI tools on AOSPA Gerrit website, or use the below command
-$ git push ssh://USERNAME@gerrit.aospa.co:29418/AOSPA/PROJECT HEAD:refs/for/pie%remove-private
+$ git push ssh://USERNAME@gerrit.aospa.co:29418/AOSPA/PROJECT HEAD:refs/for/quartz%remove-private
 
 # If you want to unset the W.I.P status on your commit, you can use UI tools on AOSPA Gerrit website, or use the below command
-$ git push ssh://USERNAME@gerrit.aospa.co:29418/AOSPA/PROJECT HEAD:refs/for/pie%ready
+$ git push ssh://USERNAME@gerrit.aospa.co:29418/AOSPA/PROJECT HEAD:refs/for/quartz%ready
 ```
 
 ### Making additional changes ###