Merge branch 'twrp-10.0-WIP' of https://github.com/minimal-manifest-twrp/platform_manifest_twrp_omni into android-10.0

* 'twrp-10.0-WIP' of https://github.com/minimal-manifest-twrp/platform_manifest_twrp_omni:
  Use omni update_engine for now
  platform/packages/apps/Browser2 is already removed in Omni
  Removed OmniApp android_packages_apps_OmniRemote
  Switch to TeamWin TWRP android-10.0 branch
  twrp-10.0 initial
  Readd platform/system/libufdt to ensure dtbo building
  manifest: Don't track generic device repo and kernel configs
  twrp: source repo from TeamWin
  manifest: Stop tracking more apps
  Move to TeamWin's android_system_update_engine
  Add minimal twrp for 9.0
  manifest: andrid-10_r35
  manifest: enhance readme
  manifest: move OmniLib to public repos
  manifest: fix typos
  manifest: add back missing OmniChange
  manifest: repo split
  manifes: android10.0.0_r33
  manifest: remove packages/apps/Browser2
  manifest: add omni system/bpf
  manifest: sync exfat
  manifest: android-10.0.0_r31
  [DNM] Revert "Revert "Revert "manifest: bring back chromium-webview"""
  manifest: switch to our PackageInstaller fork
  manifest: android-10_r29
  manifes: android-10_r28
  manifest: drop OmniRecord
  manifest: android-10.0.0_r25
  manifest: add frameworks/opt/chips
  manifest: add OmniRemote and vnc server
  manifest: android-10.0.0_r20
  remove: remove all generic devices
  omni: update readme for android-10 branch
  manifest: use omnirom MediaProvider
  Revert "Revert "manifest: bring back chromium-webview""
  Revert "manifest: bring back chromium-webview"
  manifest: remove coral repos
  manifest: android-10.0.0_r14
  remove deskclock
  manifest: android-10.0.0_r11
  manifest: add back ExactCalculator
  manifest: bring back chromium-webview
  manifes: replace OmniClock with DeskClock
  manifest: dont remove DeskClock
  manifest: add omni ThemePicker repo
  manifest: update to android-10.0.0_r5
  Revert "manifest: add prebuilts openssl"
  manifest: add back OpenDelta
  remove: add back external/nos
  manifest: switch to WallpaperPicker2
  android: Update OmniChromium repo to android-10
  manifest: enalbe OmniRecord
  manifest: enable OmniJaws and MusicFx
  manifest: add prebuilts openssl
  manifest: add display-commonsys-intf
  manifest: dont remove bootctrl
  manifest: update caf branches
  manifest: add back wlan
  manifest: add libncurses
  manifest: bring back some Omni apps
  manifest: android 10
  manifest: android-9.0.0_r47
  manifest: update to 9.0.0_r44
  manifest: android-9.0.0_r40
  manifest: update to android-9.0.0_r37
  manifest: switch ntfs-3g branch
  manifest: change to omni Bluetooth
  manifest: add vendor/interfaces
  manifest: android-9.0.0_r35
  manifest: switch to omni packages/apps/Tag
  android: add qcom oss interfaces repo
  manifest: android-9.0.0_r34
  manifest: update to android-9.0.0_r31
  manifest: switch to omni external/skia
  manifest: update to android-9.0.0_r30
  manifest: disable global commit_msg_test_field repohook check
  remove obsolete information from READNE.md
  manifest: android-9.0.0_r21
  manifest: kill the cuttlefish correctly
  manifest: remove cuttlefish as well
  remove sdm845 hals, external/nos and crosshatch device repos
  Add linkfile to create namespace
  Manifest for Android 9.0.0 Release 16 (PQ1A.181105.017.A1)
  manifest: use forked prebuilts/build-tools
  manifest: android-9.0.0_r12
  Manifest for Android 9.0.0 Release 12
  Manifest for Android 9.0.0_r11
  manifest: add OmniRecord
  manifest: use forked libhardware_legacy
  manifest: android-9.0.0_r10
  manifest: omni: Add command line tools
  Manifest for Android 9.0.0 Release 10
  Manifest for Android 9.0.0 Release 9
  Fork Aosp NXP NFC project
  manifest: switch remaining repos to 9.0
  manifest: sync with android-9.0.0_r6
  Replace packages/apps/DocumentsUI
  manifest: add OmniChromium from gitlab
  android: update repos to 9.0
  android: Bump hardware/qcom/bt to android-9.0
  android: Omnibrain pie branch
  Replace packages/apps/SettingsIntelligence path to new repository android_packages_apps_SettingsIntelligence
  Manifest for Android 9.0.0 Release 8 (PPR2.180905.006.A1)
  Manifest for Android 9.0.0 Release 7 (PPR2.180905.006)
  Manifest for Android 9.0.0 Release 6 (PPR2.180905.005)
  Manifest for Android 9.0.0 Release 5 (PPR1.180905.003)
  android: update OpenDelta to android-9.0
  android: update OmniGears to android-9.0
  manifest: remove uneeded generic device repos
  dont remove emulator
  update branches
  restore device/generic/common
  Android Pie 9.0.0_r3
  Manifest for Android 9.0.0 Release 3 (PPR1.180610.011)
  Manifest for pie-release.
  Manifest for pie-dev.
  Add "external/python/mock" to the manifest.
  Revert "Remove prebuilts/maven_repo/android and google-play-service-client-libraries-3p"
  Remove prebuilts/maven_repo/android and google-play-service-client-libraries-3p
  Add "tools/asuite" to the manifest.
  Add 'system/iorap' to the manifest.
  Add 'external/google-fruit' to manifest
  Add 'external/Reactive-Extensions/RxCpp' to manifest
  Add platform/external/epid-sdk.
  Add external/arm-optimized-routines.
  Add external/apache-commons-bcel
  Add external/yapf to manifest
  Add device poplar
  Replace system/update_engine path to new repository android_system_update_engine
  Re-add minigbm to default manifest
  Add Vulkan Headers repo
  Remove libvorbis; the platform doesn't use it
  Add packages/apps/Car/Notification to default manifest
  Add external/newfs_msdos.
  Remove external/valgrind from the manifest.
  Remove abi-compatible-checker and abi-dumper from manifest
  Add platform/tools/external_updater to manifest
  Remove unused projects
  Remove fugu
  Add external/python/apitools to manifest.
  Add external/python/dateutil to the manifest.
  Remove system/tpm entry.
  Add NNAPI benchmark repositories.
  Remove empty projects that are inactive for a year.
  Remove netcat from the manifest.
  Add platform/external/cldr in AOSP manifest
  Remove obsolete (and broken) targets.
  Remove libmojo.
  DO NOT MERGE: Add platform/system/tools/bpt to AOSP manifest
  Remove external/timezonepicker-support
  Add platform/tools/security to manifest
  Add tools/test/graphicsbenchmark to manifest
  Add external/dokka to manifest.xml.
  Add hardware/st/nfc/
  Manifest: Add perf_data_converter
  Remove external/fio from the manifest.
  Add hardware/google/interfaces
  remove x86_64-linux-glibc2.11-4.8 prebuilt
  Add javaparser
  Add pdk tag to cn-cbor
  Remove external/c-ares from manifest.
  prebuilts/deqp is a prebuilt project, use clone-depth="1" like others.
  add packages/apps/Car/Launcher to manifest
  Remove external/messageformat
  Add external project webview_support_interfaces.
  Disconnect source.android.com from platform build: it has been moved to piper, and no longer have build glues.
  Make this file more ordered.
  Remove external/netperf from the manifest.
  Reconcile with internal master.
  Remove unused project external/fmtlib.
  Add toolchain/pgo-profiles to the 'pdk' group
  Remove unused liblzf
  Adds hvxservice to the manifest
  Use pdk-fs for Traceur app.
  Add subsampling-scale-image-view to manifest.
  Add frameworks/opt/car/services to master
  Added apkzlib to default manifest
  Add external/scapy to manifest.
  In manifest, added the new project: name="platform/tools/metalava"
  Add clang-tools to aosp-master.
  Add toolchain/pgo-profiles to the manifest
  Add external/cn-cbor
  Remove external/bison
  In AOSP manifest, added the project: platform/external/libxcam
  Add hardware/nxp/secure_element
  Remove libregex-re2 from the platform manifest.
  Add vts group tags for python projects.
  Remove frameworks/opt/bluetooth
  add external/python/<package> repos
  Add external/puffin.
  Removing platform/external/xmlwriter from AOSP manifest
  Expose tools/acloud for TF development
  In manifest, removed project: platform/external/lld
  Remove platform/external/littlemock
  Add hardware/nxp/nfc to manifest.
  delete platform/external/donuts
  DO NOT MERGE: Add cuttlefish projects
  Revert "DO NOT MERGE: Add cuttlefish projects"
  DO NOT MERGE: Add cuttlefish projects
  DO NOT MERGE: Connect external/google-api-services-storage and test/sts to platform manifest.
  Add packages/apps/SecureElement in default.xml
  Adding platform/prebuilts/maven_repo/google-play-service-client-libraries-3p to master manifest
  Add external/tensorflow to the manifest.
  Add external/one-true-awk.
  Use a shallow checkout for the Chromium webview.apk prebuilt
  Remove external/r8
  manifest: add cpplint (google-styleguide), update repohooks toolpath
  register test/vts-testcase/nbu
  Add Traceur app to aosp repo manifest.
  Add prebuilts/r8
  Add external/oj-libjdwp to default manifest.
  Manifest after merging oreo dr1 dev into master
  Remove unused eclipse projects.
  Remove external/svox from the manifest.
  Add gflags
  Add external/annotation-tools project to master branch
  Add prebuilts/jdk/jdk9
  Add external/perfetto to the manifest
  add kernel/configs to the manifest
  Add external/kotlinc to the manifest
  Add platform/tools/dexter to manifest.
  Add external/error_prone to the manifest
  Add system/iot/attestation
  Manifest update after merging with oc-dev - DO NOT MERGE
  add test/framework dir
  Add external/golang-protobuf
  Add toolchain/benchmark to the manifest
  Add external/shaderc/spirv-headers to the manifest
  Add turbine to the AOSP master manifest.
  Remove unused project external/libutf.
  register test/vti/alert
  Add packages/apps/TimeZoneUpdater to manifest.xml
  Add prebuilts/jdk/jdk8 to the manifest
  Add device/generic/uml project
  Add external/xz-embedded to the manifest.
  Add external/r8 to repo manifest file.
  Add external/drrickorang to default manifest
  In manifest added project platform/system/timezone groups=pdk bug: 62335402
  added <project path=packages/apps/TimeZoneData name=platform/packages/apps/TimeZoneData groups=pdk /> bug# 62080143
  register vti (vendor test infrastructure) projects
  Add external/brotli to the manifest.
  Removing N6 and N9/N9LTE from master manifest (DO NOT MERGE)
  Add new build projects to AOSP manifest
  Add platform/external/libbackup.
  Add in platform/tools/tradefederation/contrib to master manifest.
  Add prebuilts/abi-dumps/vndk and ndk to manifest.
  Update path of tradefederation projects.
  Remove hardware/qcom/msm8x74
  Remove libweave repository.
  Add external/wycheproof.
  Remove obsolete strp library
  Add packages/apps/RetailDemo.
  BuiltInPrintService relies on framework/base aidl so it cannot be in PDK
  add external/libnetfilter_conntrack
  Remove unused system/nativepower.
  Move Volley from frameworks/volley to external/volley.
  add external/kmod
  Remove DBus and everything depending on it.
  Add framework/hardware/interfaces + system/hardware/interfaces
  Add test/vts-testcase/hal groups=pdk
  Remove opencv3 from the manifest
  register test/vts-testcase/vndk and test/vts-testcase/hal-trace git repos
  add external/desugar
  add external/libnfnetlink
  Remove ceres-solver from the manifest
  add test/vts-testcases/hal git repo
  Revert "add test/vts-testcases/hal git repo"
  add test/vts-testcases/hal git repo
  Add external/libese
  adding new project external/toolchain-utils BUG:31321592
  Add libvintf groups="pdk".
  Add abi-compliance-checker and abi-dumper.
  register test/vts-testcase/fuzz
  Add external/libldac
  Add external/fmtlib.
  Add prebuilts/checkstyle dependency to master branch.
  Add google-java-format tools to GLOBAL-PREUPLOAD.cfg.
  Hook vts bits to build.
  Check out libcups by default when BuiltInPrintService is checked out
  Add libfmq project.
  Add packages/services/NetworkRecommendation to master.
  Add system/libufdt
  Manifest update after merging with nougat-mr1-dev
  Revert "Hook vts bits to build."
  Hook vts bits to build.
  manifest: Add system/nfc and remove external/libnfc-nci
  add BuiltInPrintService
  Revert "manifest: Add system/nfc and remove external/libnfc-nci"
  manifest: Add system/nfc and remove external/libnfc-nci
  add hardware/qcom/data/ipacfg-mgr
  Add platform/compatibility/cdd
  Add platform/system/libvintf.
  Add external project KhronosGroup/SPIRV-LLVM
  default.xml: Remove external/libnfc-nxp project.
  Add external/Microsoft-GSL.
  Remove Android's forked libselinux
  Add pre-upload tool path for gofmt
  Disable merged commit pre-upload checks by default
  Add Hook Options for clang-format
  Move build/ to build/make/
  Remove prebuilts/ninja/*
  add external/avb
  Remove external/ltrace from the manifest.
  Remove omap3.
  require the Test: field in commit messages
  start a global config w/documentation
  Remove external/jhead and hardware/ti/omap4*.
  Remove intel edison from main manifest.
  Remove gtest and gmock in favor of googletest.
  Remove native Brillo components
  Remove platform/ndk.
  add system/connectivity/wifilogd
  Add a few projects
  add repohooks to all groups
  add repohooks
  Manifest after merging nougat - DO NOT MERGE
  DO NOT MERGE ANYWHERE: Revert "add repohooks"
  add repohooks
  DO NOT MERGE ANYWHERE - Update manifest groups tags
  Remove obsolete prebuilts/clang/*/host/3.6 projects.
  Add external/junit-params
  add seccomp-tests
  Add platform/tools/apksig project to manifest.
  Add UEFI bootloader repos to device/linaro/bootloader
  Remove lldb from the manifest
  add system/connectivity/wificond
  Re-add marisa-trie depencency as it is used internally.
  Remove dependencies that got readded accidentally.
  Add external/googletest.
  add vulkan-validation-layers BUG: 27963162
  Add prebuilts/build-tools.
  switch from external/sepolicy to system/sepolicy
  Add external/libconstrainedcrypto to the manifest.
  manifest: Add testng and dependencies to manifest
  Remove abi/cpp from the manifest
  Add platform/external/libmojo
  Add device hikey
  Add kernel/tests as net_tests is deprecated in system/extras.
  Add Connectivity Test Tools to AOSP Master Manifest
  Add external/google-benchmark to the manifest.
  Add external/dtc.
  Sort entities by path and make space style more consistent.
  /prebuilts/clang/host/linux-x86 needs to always be present.
  Remove projects that do not have any files and last commit was more than two years old.
  Add platform/external/dlmalloc.
  Add external/jacoco to the manifest
  Add EmergencyInfo app to manifest.
  Add external/shflags to the manifest.
  Add platform/external/piex
  Add device/google/contexthub
  Use clone-depth="1" for all pre-built projects.
  Add external/tpm2.
  Remove external/linux-tools-perf from the manifest.
  Add platform/system/nvram to the manifest.
  Changed manifest to include the new project dng_sdk.
  Map platform/external/autotest to external/autotest
  Remove attestation, tpm_manager, trunks and add tpm to the manifest.
  Added dagger2
  Added external/caliper project
  Remove obsolete live wallpapers that depend on RS graphics APIs.
  Manifest after merging Marshmallow dr - DO NOT MERGE
  "Rename" external/libchromeos into external/libbrillo in repo manifest
  add new repo platform/system/connectivity/dhcp_client
  Add external/mmc-utils to manifest
  Add external/adt-infra to manifest
  Remove peerd from manifest
  Manifest after merging Marshmallow - DO NOT MERGE
  Add linux/darwin projects for new Clang prebuilts.
  Add rmi4utils to external
  [Brillo] Add external/xmlrpcpp to the manifest
  Add external/libdivsufsort in AOSP.
  Add ca-certificates to the manifest
  Add platform/external/cros/system_api to the manifest
  Add linkfiles needed for soong
  Add platform/external/{lvm2,cryptsetup} to manifest
  Add platform/system/nativepower
  Add prebuilt/gdb/{darwin,linux}-x86 to manifest.
  Remove platform/prebuilts/gcc/*-x86/arm/arm-eabi-4.8
  Add system/tools/aidl to manifest
  Add attestation, tpm_manger and trunks to the manifest
  Add libcap to AOSP manifest.
  Adjust clone-depth for a few projects - DO NOT MERGE
  Add platform/system/connectivity/apmanager to the manifest
  Add external/rootdev to the manifest.
  Add go prebuilts to manifest
  Add external/tlsdate to manifest.
  Add spaces
  Add platform/external/google-breakpad
  Add toolchain/binutils to the platform manifest.
  Add external/libdaemon and external/avahi repos.
  Add platform/system/webservd
  Add dhcp-6.8.2 to manifest
  Update manifest groups tags - DO NOT MERGE
  Add libunwind_llvm.
  Add platform/external/libmicrohttpd
  Add system/firewalld to manifest.
  Add external OpenCV3 project
  Remove Browser
  Add external/iw to the manifest
  Add weave repositories to manifest
  Add DBus binding generator
  Add system/connectivity/shill to the manifest.
  Add new build projects to the manifest
  Add Browser2 to master
  Add platform/external/c-ares to manifest.
  Add platform/system/update_engine to the manifest
  Add platform/system/wifi to the manifest
  Remove target 4.8 toolchains.
  Add minijail to the manifest
  Add curl to the manifest.
  Add platform/external/gemmlowp
  Add platform/external/libchromeos.
  Add platform/external/modp_b64
  Add platform/external/dbus
  Add platform/external/libchrome
  Add libevent to manifest
  Add platform/external/fec
  Add gmock
  remove external/checkpolicy and external/libsepol
  Revert "Remove external/lzma"
  Remove base gpl files
  Remove obsoleted platform/external/genext2fs
  Add device/google/debugcable
  Switch to BoringSSL DO NOT MERGE
  Add platform/system/gatekeeper
  Restore pdk group to system/bt
  Replace platform/external/bluetooth/bluedroid with platform/system/bt
  add external/selinux to default manifest
  Add platform/external/sonic
  Replace repo group on external/squashfs-tools with "pdk"
  Add groups="pdk-cw-fs" for [external/squashfs-tools]
  Add platform/external/mockftpserver
  Add platform/external/slf4j
  Remove srec / VoiceDialer from the default manifest.
  Add packages/providers/BookmarkProvider
  Manifest update after merging with lollipop-mr1-dev
  Add platform/packages/apps/FMRadio
  Add platform/external/lohit-fonts
  Revert "Revert "Revert "Switch to BoringSSL DO NOT MERGE"""
  Revert "Revert "Switch to BoringSSL DO NOT MERGE""
  Remove external/pixman.
  Add platform/system/keyguard
  Add platform/external/libmpeg2
  Add platform/external/libavc
  Revert "Switch to BoringSSL DO NOT MERGE"
  Switch to BoringSSL DO NOT MERGE
  Add external/squashfs-tools and external/lz4
  Remove legacy clang prebuilts, and update 3.6 to use appropriate groups.
  Remove external/apache-qp
  Remove external/lzma
  Revert "Add platform/external/boringssl"
  Add platform/external/cblas
  Add platform/external/boringssl
  Remove external/gcc-demangle
  Remove several unused projects
  Remove google-diff-match-patch
  Remove platform/external/qemu-pc-bios
  Remove external/qemu
  Remove empty project platform/bootable/bootloader/legacy
  Remove obsolete project
  Delete obsolete mips[64]el-linux-android-4.8
  Add platform/external/lld
  Add platform/external/v8
  Add platform/external/libvterm
  Add platform/packages/apps/Terminal
  Remove platform/packages/apps/OMA-DM - DO NOT MERGE
  The return of external/vogar
  Add platform/prebuilts/clang/darwin-x86/host/3.6
  Add platform/prebuilts/clang/linux-x86/host/3.6
  Add toybox to the default manifest.
  Remove stressapptest.
  DO NOT MERGE  Remove tools/tradefederation from aosp/master for build reasons.
  Manifest update after merging with lollipop-dev
  Add platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8
  Remove unused projects
  Remove obsolete libffi
  Remove packages/inputmethods/PinyinIME
  Add platform/frameworks/opt/inputconnectioncommon
  Remove platform/frameworks/opt/mailcommon
  Remove platform/external/hyphenation and platform/external/libxslt
  Remove platform/external/sil-fonts
  No longer need bootable/diskinstaller.
  Remove external/grub.
  Remove libcxxrt from the manifest.
  Add platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9
  Add platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9
  Add platform/external/chromium_org/third_party/libjpeg_turbo
  Remove Chromium's copy of OpenSSL.
  Remove external/xdelta3 and external/syspatch
  Remove external/icu4c and add external/icu to the PDK.
  Remove unused project external/libppp.
  Remove unused host Linux gcc project.
  Add platform/system/keymaster
  Add platform/external/chromium_org/third_party/boringssl/src
  Add platform/packages/apps/TvSettings
  Remove gcc projects not in use any more.
  Add platform/frameworks/multidex
  Add platform/external/icu
  Add external/chromium_org/third_party/libaddressinput/src.
  Add platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9
  Add platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9
  Add platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9
  Add platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9
  DO NOT MERGE: Revert "remove external/libnl-headers from the manifest"
  Update external/chromium_org/third_party/skia.
  Manifest for android-4.4.3
  Add device/generic/qemu
  Add external/chromium_org/third_party/openmax_dl.
  Add platform/external/fio
  Add platform/external/owasp/sanitizer
  Add platform/external/libcxxrt
  Add platform/external/f2fs-tools
  Add platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8
  Update libcxx and libcxxabi projects
  Remove platform/external/v8 project
  Add clone-depth="1" to prebuilts/qemu-kernel
  Add host prebuilts for Clang 3.5.
  Revert "Add angle_dx11 back to the manifest"
  Add angle_dx11 back to the manifest
  Add the external/jemalloc project.
  Update manifest for latest external/chromium_org.
  Add clone-depth to platform/prebuilts/android-emulator
  Add platform/prebuilts/android-emulator
  Adds external/libcxx and external/libcxxabi to manifest
  Add GCC 4.9 for aarch64.
  DO NOT MERGE: Revert "remove external/libnl-headers from the manifest"
  remove external/libnl-headers from the manifest
  Add external/ltrace to default.xml
  Add prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.[68]
  Add external/vixl
  add three external/google-fonts projects:
  Add platform/external/messageformat
  Remove host prebuilts for Clang 3.3, since we have switched to 3.4.
  Add Clang 3.4 host prebuilts to AOSP manifest.
  Remove external/dropbear
  Set clone-depth="1" for *-kernel projects
  Add prebuilts/gcc/{linux-x86,darwin-x86}/mips/mips64el-linux-android-4.8
  Add external/xdelta3 and external/syspatch
  Revert "Revert "Revert "Add external/xdelta3 and external/syspatch"""
  Revert "Revert "Add external/xdelta3 and external/syspatch""
  Revert "Remove external/libnl and external/nfacct"
  Revert "Add external/xdelta3 and external/syspatch"
  Add external/xdelta3 and external/syspatch
  Remove external/libnl and external/nfacct
  Add external/libnl and external/libnfact
  Add project platform/external/libseccomp-helper
  Add external/pcre to default.xml
  Update master manifest for Android 4.4
  Remove ti/panda
  Remove ti/wlan and ti/wpan
  Revert "Add new kitkat projects to AOSP master manifest"
  Add new kitkat projects to AOSP master manifest
  Add bouncycastle to the pdk group
  Add various gcc-4.8 projects.
  Remove the hardware/msm7k project
  Remove the pdk group for libunwind.
  Add platform/external/conscrypt to master
  Add external/libunwind to manifest.
  Add tools/studio/translation to AOSP master manifest
  Remove obsolete ping/ping6

Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>

.gitignore

@@ -0,0 +1 @@
+.idea

GLOBAL-PREUPLOAD.cfg

@@ -0,0 +1,17 @@
+# Settings in here control defaults for `repo upload` checks for all projects
+# listed in the manifest.  Do not turn on things here without first consulting
+# the wider Android team, and make sure you send out a PSA before landing.
+
+[Options]
+ignore_merged_commits = true
+
+[Builtin Hooks]
+commit_msg_test_field = false
+
+[Tool Paths]
+clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/clang-format
+git-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/git-clang-format
+gofmt = ${REPO_ROOT}/prebuilts/go/${BUILD_OS}/bin/gofmt
+google-java-format = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format
+google-java-format-diff = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format-diff.py
+cpplint = ${REPO_ROOT}/external/google-styleguide/cpplint/cpplint.py

README.md

@@ -63,7 +63,7 @@ $ repo init --depth=1 -u git://github.com/PitchBlackRecoveryProject/manifest_pb.
 ```
 For Upgrade Encryption Devices i.e., POCO, Oneplus 6, Using Stock Oreo or Pie with pie manifest
 ```bash
-$ repo init -u git://github.com/PitchBlackRecoveryProject/manifest_pb.git -b android-9.0
+$ repo init -u git://github.com/PitchBlackRecoveryProject/manifest_pb.git -b android-10.0
 ```
 Then to sync up:
 ```bash

default.xml

@@ -4,7 +4,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-9.0.0_r47"
+  <default revision="refs/tags/android-10.0.0_r35"
            remote="aosp"
            sync-c="true"
            sync-j="12" />
@@ -27,13 +27,14 @@
   <project path="art" name="platform/art" groups="pdk" />
   <project path="bionic" name="platform/bionic" groups="pdk" />
   <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" />
-  <project path="compatibility/cdd" name="platform/compatibility/cdd" groups="pdk" />
   <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs,pdk-fs" />
   <project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs,pdk-fs" />
-  <project path="developers/build" name="platform/developers/build" groups="developers" />
+  <project path="developers/build" name="platform/developers/build" groups="developers,pdk" />
   <project path="developers/demos" name="platform/developers/demos" groups="developers" />
   <project path="developers/samples/android" name="platform/developers/samples/android" groups="developers" />
   <project path="development" name="platform/development" groups="developers,pdk-cw-fs,pdk-fs" />
+  <project path="device/amlogic/yukawa" name="device/amlogic/yukawa" groups="device,yukawa,pdk" />
+  <project path="device/amlogic/yukawa-kernel" name="device/amlogic/yukawa-kernel" groups="device,yukawa,pdk" clone-depth="1" />
   <project path="device/common" name="device/common" groups="pdk-cw-fs,pdk" />
   <project path="device/generic/arm64" name="device/generic/arm64" groups="pdk" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" />
@@ -41,60 +42,70 @@
   <project path="device/generic/common" name="device/generic/common" groups="pdk" />
   <project path="device/generic/goldfish" name="device/generic/goldfish" groups="pdk" />
   <project path="device/generic/goldfish-opengl" name="device/generic/goldfish-opengl" groups="pdk" />
-  <project path="device/generic/mips" name="device/generic/mips" groups="pdk" />
-  <project path="device/generic/mips64" name="device/generic/mips64" groups="pdk" />
   <project path="device/generic/mini-emulator-arm64" name="device/generic/mini-emulator-arm64" groups="pdk" />
   <project path="device/generic/mini-emulator-armv7-a-neon" name="device/generic/mini-emulator-armv7-a-neon" groups="pdk" />
-  <project path="device/generic/mini-emulator-mips" name="device/generic/mini-emulator-mips" groups="pdk" />
-  <project path="device/generic/mini-emulator-mips64" name="device/generic/mini-emulator-mips64" groups="pdk" />
   <project path="device/generic/mini-emulator-x86" name="device/generic/mini-emulator-x86" groups="pdk" />
   <project path="device/generic/mini-emulator-x86_64" name="device/generic/mini-emulator-x86_64" groups="pdk" />
+  <project path="device/generic/opengl-transport" name="device/generic/opengl-transport" groups="pdk" />
   <project path="device/generic/qemu" name="device/generic/qemu" groups="pdk" />
+  <project path="device/generic/trusty" name="device/generic/trusty" groups="pdk" />
   <project path="device/generic/uml" name="device/generic/uml" groups="device,pdk" />
   <project path="device/generic/x86" name="device/generic/x86" groups="pdk" />
   <project path="device/generic/x86_64" name="device/generic/x86_64" groups="pdk" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device,pdk" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device,pdk" />
   <project path="device/google/atv" name="device/google/atv" groups="device,broadcom_pdk,generic_fs,pdk" />
+  <project path="device/google/bonito" name="device/google/bonito" groups="device,bonito" />
+  <project path="device/google/bonito-kernel" name="device/google/bonito-kernel" groups="device,bonito" clone-depth="1" />
+  <project path="device/google/bonito-sepolicy" name="device/google/bonito-sepolicy" groups="device,bonito" />
   <project path="device/google/contexthub" name="device/google/contexthub" groups="device,marlin,pdk" />
-  <project path="device/google/crosshatch" name="device/google/crosshatch" groups="device,crosshatch" />
-  <project path="device/google/crosshatch-kernel" name="device/google/crosshatch-kernel" groups="device,crosshatch" clone-depth="1" />
-  <project path="device/google/crosshatch-sepolicy" name="device/google/crosshatch-sepolicy" groups="device,crosshatch" />
-  <project path="device/google/cuttlefish" name="device/google/cuttlefish" groups="device" />
-  <project path="device/google/cuttlefish_common" name="device/google/cuttlefish_common" groups="device" />
-  <project path="device/google/cuttlefish_kernel" name="device/google/cuttlefish_kernel" groups="device" clone-depth="1" />
-  <project path="device/google/marlin" name="device/google/marlin" groups="device,marlin,pdk" />
-  <project path="device/google/marlin-kernel" name="device/google/marlin-kernel" groups="device,marlin,pdk" clone-depth="1" />
-  <project path="device/google/muskie" name="device/google/muskie" groups="device,muskie,pdk" />
-  <project path="device/google/taimen" name="device/google/taimen" groups="device,taimen,pdk" />
+  <project path="device/google/coral" name="device/google/coral" groups="device,coral" />
+  <project path="device/google/coral-kernel" name="device/google/coral-kernel" groups="device,coral" clone-depth="1" />
+  <project path="device/google/coral-sepolicy" name="device/google/coral-sepolicy" groups="device,coral" />
+  <project path="device/google/crosshatch" name="device/google/crosshatch" groups="device,crosshatch,generic_fs" />
+  <project path="device/google/crosshatch-kernel" name="device/google/crosshatch-kernel" groups="device,crosshatch,generic_fs" clone-depth="1" />
+  <project path="device/google/crosshatch-sepolicy" name="device/google/crosshatch-sepolicy" groups="device,crosshatch,generic_fs" />
+  <project path="device/google/cuttlefish" name="device/google/cuttlefish" groups="device,pdk" />
+  <project path="device/google/cuttlefish_common" name="device/google/cuttlefish_common" groups="device,pdk" />
+  <project path="device/google/cuttlefish_kernel" name="device/google/cuttlefish_kernel" groups="device,pdk" clone-depth="1" />
+  <project path="device/google/cuttlefish_vmm" name="device/google/cuttlefish_vmm" groups="device,pdk" clone-depth="1" />
+  <project path="device/google/fuchsia" name="device/google/fuchsia" groups="device" />
+  <project path="device/google/marlin" name="device/google/marlin" groups="device,marlin" />
+  <project path="device/google/marlin-kernel" name="device/google/marlin-kernel" groups="device,marlin" clone-depth="1" />
+  <project path="device/google/muskie" name="device/google/muskie" groups="device,generic_fs,muskie" />
+  <project path="device/google/taimen" name="device/google/taimen" groups="device,taimen" />
   <project path="device/google/vrservices" name="device/google/vrservices" groups="pdk" clone-depth="1" />
-  <project path="device/google/wahoo" name="device/google/wahoo" groups="device,wahoo,pdk" />
-  <project path="device/google/wahoo-kernel" name="device/google/wahoo-kernel" groups="device,wahoo,pdk" clone-depth="1" />
+  <project path="device/google/wahoo" name="device/google/wahoo" groups="device,generic_fs,wahoo" />
+  <project path="device/google/wahoo-kernel" name="device/google/wahoo-kernel" groups="device,generic_fs,wahoo" clone-depth="1" />
   <project path="device/linaro/bootloader/arm-trusted-firmware" name="device/linaro/bootloader/arm-trusted-firmware" />
   <project path="device/linaro/bootloader/edk2" name="device/linaro/bootloader/edk2" />
   <project path="device/linaro/bootloader/OpenPlatformPkg" name="device/linaro/bootloader/OpenPlatformPkg" />
   <project path="device/linaro/hikey" name="device/linaro/hikey" groups="device,hikey,pdk" />
   <project path="device/linaro/hikey-kernel" name="device/linaro/hikey-kernel" groups="device,hikey,pdk" clone-depth="1" />
+  <project path="device/linaro/poplar" name="device/linaro/poplar" groups="device,poplar,pdk" />
+  <project path="device/linaro/poplar-kernel" name="device/linaro/poplar-kernel" groups="device,poplar,pdk" clone-depth="1" />
   <project path="device/sample" name="device/sample" groups="pdk" />
+  <project path="device/ti/beagle_x15" name="device/ti/beagle-x15" groups="device,beagle_x15,pdk" />
+  <project path="device/ti/beagle_x15-kernel" name="device/ti/beagle-x15-kernel" groups="device,beagle_x15,pdk" clone-depth="1" />
+  <project path="external/ARMComputeLibrary" name="platform/external/ARMComputeLibrary" groups="pdk" />
   <project path="external/aac" name="platform/external/aac" groups="pdk" />
-  <project path="external/abi-compliance-checker" name="platform/external/abi-compliance-checker" groups="pdk" />
-  <project path="external/abi-dumper" name="platform/external/abi-dumper" groups="pdk" />
+  <project path="external/adeb" name="platform/external/adeb" groups="pdk" />
   <project path="external/adhd" name="platform/external/adhd" groups="pdk" />
   <project path="external/adt-infra" name="platform/external/adt-infra" groups="adt-infra,notdefault,pdk-fs" />
   <project path="external/android-clat" name="platform/external/android-clat" groups="pdk" />
   <project path="external/androidplot" name="platform/external/androidplot" groups="pdk" />
-  <project path="external/annotation-tools" name="platform/external/annotation-tools" groups="pdk" />
   <project path="external/ant-glob" name="platform/external/ant-glob" groups="pdk" />
   <project path="external/antlr" name="platform/external/antlr" groups="pdk" />
+  <project path="external/apache-commons-bcel" name="platform/external/apache-commons-bcel" groups="pdk" />
+  <project path="external/apache-commons-compress" name="platform/external/apache-commons-compress" groups="pdk" />
   <project path="external/apache-commons-math" name="platform/external/apache-commons-math" groups="pdk" />
   <project path="external/apache-harmony" name="platform/external/apache-harmony" groups="pdk" />
   <project path="external/apache-http" name="platform/external/apache-http" groups="pdk" />
   <project path="external/apache-xml" name="platform/external/apache-xml" groups="pdk" />
   <project path="external/archive-patcher" name="platform/external/archive-patcher" groups="pdk" />
   <project path="external/arm-neon-tests" name="platform/external/arm-neon-tests" groups="vendor" />
+  <project path="external/arm-optimized-routines" name="platform/external/arm-optimized-routines" groups="pdk" />
   <project path="external/autotest" name="platform/external/autotest" groups="pdk-fs" />
   <project path="external/avb" name="platform/external/avb" groups="pdk" />
-  <project path="external/bart" name="platform/external/bart" groups="pdk" />
+  <project path="external/bcc" name="platform/external/bcc" groups="pdk" />
   <project path="external/blktrace" name="platform/external/blktrace" groups="pdk" />
   <project path="external/boringssl" name="platform/external/boringssl" groups="pdk" />
   <project path="external/bouncycastle" name="platform/external/bouncycastle" groups="pdk" />
@@ -103,11 +114,13 @@
   <project path="external/bzip2" name="platform/external/bzip2" groups="pdk" />
   <project path="external/caliper" name="platform/external/caliper" groups="pdk" />
   <project path="external/capstone" name="platform/external/capstone" groups="pdk" />
+  <project path="external/catch2" name="platform/external/catch2" groups="pdk" />
   <project path="external/cblas" name="platform/external/cblas" groups="pdk" />
   <project path="external/chromium-libpac" name="platform/external/chromium-libpac" groups="pdk" />
   <project path="external/chromium-trace" name="platform/external/chromium-trace" groups="pdk" />
   <project path="external/chromium-webview" name="platform/external/chromium-webview" groups="pdk" clone-depth="1" />
   <project path="external/clang" name="platform/external/clang" groups="pdk" />
+  <project path="external/cldr" name="platform/external/cldr" groups="pdk" />
   <project path="external/cmockery" name="platform/external/cmockery" groups="pdk" />
   <project path="external/cn-cbor" name="platform/external/cn-cbor" groups="pdk" />
   <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="pdk" />
@@ -117,53 +130,61 @@
   <project path="external/curl" name="platform/external/curl" groups="pdk" />
   <project path="external/dagger2" name="platform/external/dagger2" groups="pdk" />
   <project path="external/deqp" name="platform/external/deqp" groups="pdk-fs" />
+  <project path="external/deqp-deps/SPIRV-Headers" name="platform/external/deqp-deps/SPIRV-Headers" groups="pdk-fs" />
+  <project path="external/deqp-deps/SPIRV-Tools" name="platform/external/deqp-deps/SPIRV-Tools" groups="pdk-fs" />
+  <project path="external/deqp-deps/glslang" name="platform/external/deqp-deps/glslang" groups="pdk-fs" />
   <project path="external/desugar" name="platform/external/desugar" groups="pdk" />
-  <project path="external/devlib" name="platform/external/devlib" groups="pdk" />
   <project path="external/dexmaker" name="platform/external/dexmaker" groups="pdk" />
-  <project path="external/dhcpcd-6.8.2" name="platform/external/dhcpcd-6.8.2" groups="pdk" />
   <project path="external/dlmalloc" name="platform/external/dlmalloc" groups="pdk" />
   <project path="external/dng_sdk" name="platform/external/dng_sdk" groups="pdk" />
   <project path="external/dnsmasq" name="platform/external/dnsmasq" groups="pdk" />
   <project path="external/doclava" name="platform/external/doclava" groups="pdk" />
-  <project path="external/drm_gralloc" name="platform/external/drm_gralloc" groups="pdk" />
+  <project path="external/dokka" name="platform/external/dokka" groups="pdk" />
   <project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer,pdk-fs" />
   <project path="external/droiddriver" name="platform/external/droiddriver" groups="pdk" />
   <project path="external/drrickorang" name="platform/external/drrickorang" groups="pdk" />
   <project path="external/dtc" name="platform/external/dtc" groups="pdk"/>
+  <project path="external/dynamic_depth" name="platform/external/dynamic_depth" groups="pdk" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" groups="pdk" />
   <project path="external/easymock" name="platform/external/easymock" groups="pdk" />
   <project path="external/eigen" name="platform/external/eigen" groups="pdk" />
   <project path="external/elfutils" name="platform/external/elfutils" groups="pdk" />
   <project path="external/emma" name="platform/external/emma" groups="pdk" />
+  <project path="external/epid-sdk" name="platform/external/epid-sdk" groups="pdk" />
   <project path="external/error_prone" name="platform/external/error_prone" groups="pdk" />
-  <project path="external/esd" name="platform/external/esd" groups="pdk" />
   <project path="external/expat" name="platform/external/expat" groups="pdk" />
-  <project path="external/eyes-free" name="platform/external/eyes-free" groups="pdk" />
   <project path="external/f2fs-tools" name="platform/external/f2fs-tools" groups="pdk" />
   <project path="external/fdlibm" name="platform/external/fdlibm" groups="pdk" />
   <project path="external/fec" name="platform/external/fec" groups="pdk" />
-  <project path="external/fio" name="platform/external/fio" groups="pdk" />
   <project path="external/flac" name="platform/external/flac" groups="pdk" />
   <project path="external/flatbuffers" name="platform/external/flatbuffers" groups="pdk" />
   <project path="external/fonttools" name="platform/external/fonttools" groups="pdk" />
   <project path="external/freetype" name="platform/external/freetype" groups="pdk" />
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" groups="pdk" />
+  <project path="external/fsverity-utils" name="platform/external/fsverity-utils" groups="pdk" />
   <project path="external/gemmlowp" name="platform/external/gemmlowp" groups="pdk" />
   <project path="external/gflags" name="platform/external/gflags" groups="pdk" />
   <project path="external/giflib" name="platform/external/giflib" groups="pdk,qcom_msm8x26" />
   <project path="external/glide" name="platform/external/glide" groups="pdk" />
   <project path="external/golang-protobuf" name="platform/external/golang-protobuf" groups="pdk" />
-  <project path="external/google-api-services-storage" name="platform/external/google-api-services-storage" groups="pdk" />
   <project path="external/google-benchmark" name="platform/external/google-benchmark" groups="pdk" />
   <project path="external/google-breakpad" name="platform/external/google-breakpad" groups="pdk-fs" />
+  <project path="external/google-fonts/arbutus-slab" name="platform/external/google-fonts/arbutus-slab" groups="pdk" />
+  <project path="external/google-fonts/arvo" name="platform/external/google-fonts/arvo" groups="pdk" />
   <project path="external/google-fonts/carrois-gothic-sc" name="platform/external/google-fonts/carrois-gothic-sc" groups="pdk" />
   <project path="external/google-fonts/coming-soon" name="platform/external/google-fonts/coming-soon" groups="pdk" />
   <project path="external/google-fonts/cutive-mono" name="platform/external/google-fonts/cutive-mono" groups="pdk" />
   <project path="external/google-fonts/dancing-script" name="platform/external/google-fonts/dancing-script" groups="pdk" />
+  <project path="external/google-fonts/lato" name="platform/external/google-fonts/lato" groups="pdk" />
+  <project path="external/google-fonts/source-sans-pro" name="platform/external/google-fonts/source-sans-pro" groups="pdk" />
+  <project path="external/google-fonts/rubik" name="platform/external/google-fonts/rubik" groups="pdk" />
+  <project path="external/google-fonts/zilla-slab" name="platform/external/google-fonts/zilla-slab" groups="pdk" />
+  <project path="external/google-fruit" name="platform/external/google-fruit" groups="pdk" />
   <project path="external/google-styleguide" name="platform/external/google-styleguide" groups="pdk" />
-  <project path="external/google-tv-pairing-protocol" name="platform/external/google-tv-pairing-protocol" groups="pdk" />
   <project path="external/googletest" name="platform/external/googletest" groups="pdk" />
   <project path="external/gptfdisk" name="platform/external/gptfdisk" groups="pdk" />
+  <project path="external/grpc-grpc" name="platform/external/grpc-grpc" groups="pdk,tradefed" />
+  <project path="external/grpc-grpc-java" name="platform/external/grpc-grpc-java" groups="pdk,tradefed" />
   <project path="external/guava" name="platform/external/guava" groups="pdk" />
   <project path="external/guice" name="platform/external/guice" groups="pdk" />
   <project path="external/hamcrest" name="platform/external/hamcrest" groups="pdk" />
@@ -172,7 +193,9 @@
   <project path="external/hyphenation-patterns" name="platform/external/hyphenation-patterns" groups="pdk" />
   <project path="external/icu" name="platform/external/icu" groups="pdk" />
   <project path="external/ImageMagick" name="platform/external/ImageMagick" groups="pdk" />
+  <project path="external/image_io" name="platform/external/image_io" groups="pdk" />
   <project path="external/ims" name="platform/external/ims" groups="pdk" />
+  <project path="external/iperf3" name="platform/external/iperf3" groups="pdk" />
   <project path="external/iproute2" name="platform/external/iproute2" groups="pdk" />
   <project path="external/ipsec-tools" name="platform/external/ipsec-tools" groups="pdk" />
   <project path="external/iptables" name="platform/external/iptables" groups="pdk" />
@@ -181,13 +204,13 @@
   <project path="external/jacoco" name="platform/external/jacoco" groups="pdk" />
   <project path="external/jarjar" name="platform/external/jarjar" groups="pdk" />
   <project path="external/javaparser" name="platform/external/javaparser" groups="pdk" />
+  <project path="external/javapoet" name="platform/external/javapoet" groups="pdk" />
   <project path="external/javasqlite" name="platform/external/javasqlite" groups="pdk" />
-  <project path="external/javassist" name="platform/external/javassist" groups="pdk" />
   <project path="external/jcommander" name="platform/external/jcommander" groups="pdk" />
   <project path="external/jdiff" name="platform/external/jdiff" groups="pdk" />
   <project path="external/jemalloc" name="platform/external/jemalloc" groups="pdk" />
+  <project path="external/jemalloc_new" name="platform/external/jemalloc_new" groups="pdk" />
   <project path="external/jline" name="platform/external/jline" groups="pdk,tradefed,pdk-fs" />
-  <project path="external/jmdns" name="platform/external/jmdns" groups="pdk" />
   <project path="external/jsilver" name="platform/external/jsilver" groups="pdk" />
   <project path="external/jsmn" name="platform/external/jsmn" groups="pdk" />
   <project path="external/jsoncpp" name="platform/external/jsoncpp" groups="pdk" />
@@ -199,30 +222,29 @@
   <project path="external/kmod" name="platform/external/kmod" groups="pdk" />
   <project path="external/kotlinc" name="platform/external/kotlinc" groups="pdk" />
   <project path="external/ksoap2" name="platform/external/ksoap2" groups="pdk" />
+  <project path="external/libaom" name="platform/external/libaom" groups="pdk" />
   <project path="external/libavc" name="platform/external/libavc" groups="pdk" />
   <project path="external/libbackup" name="platform/external/libbackup" groups="pdk" />
   <project path="external/libbrillo" name="platform/external/libbrillo" groups="pdk" />
   <project path="external/libcap" name="platform/external/libcap" groups="pdk" />
   <project path="external/libcap-ng" name="platform/external/libcap-ng" groups="pdk" />
   <project path="external/libchrome" name="platform/external/libchrome" groups="pdk" />
-  <project path="external/libconstrainedcrypto" name="platform/external/libconstrainedcrypto" groups="pdk" />
   <project path="external/libcups" name="platform/external/libcups" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/libcxx" name="platform/external/libcxx" groups="pdk" />
   <project path="external/libcxxabi" name="platform/external/libcxxabi" groups="pdk" />
   <project path="external/libdaemon" name="platform/external/libdaemon" groups="pdk" />
   <project path="external/libdivsufsort" name="platform/external/libdivsufsort" groups="pdk" />
   <project path="external/libdrm" name="platform/external/libdrm" groups="pdk" />
-  <project path="external/libedit" name="platform/external/libedit" groups="pdk" />
   <project path="external/libese" name="platform/external/libese" groups="pdk" />
   <project path="external/libevent" name="platform/external/libevent" groups="pdk" />
   <project path="external/libexif" name="platform/external/libexif" groups="pdk" />
   <project path="external/libffi" name="platform/external/libffi" groups="pdk" />
+  <project path="external/libgav1" name="platform/external/libgav1" groups="pdk" />
   <project path="external/libgsm" name="platform/external/libgsm" groups="pdk" />
   <project path="external/libhevc" name="platform/external/libhevc" groups="pdk" />
   <project path="external/libjpeg-turbo" name="platform/external/libjpeg-turbo" groups="pdk" />
+  <project path="external/libkmsxx" name="platform/external/libkmsxx" groups="pdk" />
   <project path="external/libldac" name="platform/external/libldac" groups="pdk" />
-  <project path="external/libmicrohttpd" name="platform/external/libmicrohttpd" groups="pdk" />
-  <project path="external/libmojo" name="platform/external/libmojo" groups="pdk" />
   <project path="external/libmpeg2" name="platform/external/libmpeg2" groups="pdk" />
   <project path="external/libmtp" name="platform/external/libmtp" groups="pdk" />
   <project path="external/libnetfilter_conntrack" name="platform/external/libnetfilter_conntrack" groups="pdk" />
@@ -233,12 +255,13 @@
   <project path="external/libpcap" name="platform/external/libpcap" groups="pdk" />
   <project path="external/libphonenumber" name="platform/external/libphonenumber" groups="pdk" />
   <project path="external/libpng" name="platform/external/libpng" groups="pdk" />
+  <project path="external/libprotobuf-mutator" name="platform/external/libprotobuf-mutator" groups="pdk" />
   <project path="external/libtextclassifier" name="platform/external/libtextclassifier" groups="pdk" />
   <project path="external/libunwind" name="platform/external/libunwind" groups="pdk" />
   <project path="external/libunwind_llvm" name="platform/external/libunwind_llvm" groups="pdk" />
   <project path="external/libusb" name="platform/external/libusb" groups="pdk" />
   <project path="external/libusb-compat" name="platform/external/libusb-compat" groups="pdk" />
-  <project path="external/libvncserver" name="platform/external/libvncserver" groups="pdk" />
+  <project path="external/libutf" name="platform/external/libutf" groups="pdk" />
   <project path="external/libvpx" name="platform/external/libvpx" groups="pdk" />
   <project path="external/libvterm" name="platform/external/libvterm" groups="pdk" />
   <project path="external/libxaac" name="platform/external/libxaac" groups="pdk" />
@@ -247,9 +270,9 @@
   <project path="external/libxml2" name="platform/external/libxml2" groups="pdk,libxml2" />
   <project path="external/libyuv" name="platform/external/libyuv" groups="pdk,libyuv" />
   <project path="external/linux-kselftest" name="platform/external/linux-kselftest" groups="vts,pdk" />
-  <project path="external/lisa" name="platform/external/lisa" groups="pdk" />
   <project path="external/llvm" name="platform/external/llvm" groups="pdk" />
   <project path="external/lmfit" name="platform/external/lmfit" groups="pdk" />
+  <project path="external/lua" name="platform/external/lua" groups="pdk" />
   <project path="external/ltp" name="platform/external/ltp" groups="vts,pdk" />
   <project path="external/lz4" name="platform/external/lz4" groups="pdk" />
   <project path="external/lzma" name="platform/external/lzma" groups="pdk" />
@@ -257,9 +280,9 @@
   <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk" />
   <project path="external/mesa3d" name="platform/external/mesa3d" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/Microsoft-GSL" name="platform/external/Microsoft-GSL" groups="pdk" />
+  <project path="external/minigbm" name="platform/external/minigbm" groups="pdk" />
   <project path="external/minijail" name="platform/external/minijail" groups="pdk" />
   <project path="external/mksh" name="platform/external/mksh" groups="pdk" />
-  <project path="external/mmc-utils" name="platform/external/mmc-utils" groups="pdk" />
   <project path="external/mockftpserver" name="platform/external/mockftpserver" groups="pdk" />
   <project path="external/mockito" name="platform/external/mockito" groups="pdk" />
   <project path="external/mockwebserver" name="platform/external/mockwebserver" groups="pdk" />
@@ -269,20 +292,21 @@
   <project path="external/nanohttpd" name="platform/external/nanohttpd" groups="pdk" />
   <project path="external/nanopb-c" name="platform/external/nanopb-c" groups="pdk" />
   <project path="external/naver-fonts" name="platform/external/naver-fonts" groups="pdk" />
-  <project path="external/netcat" name="platform/external/netcat" groups="pdk" />
+  <project path="external/neon_2_sse" name="platform/external/neon_2_sse" groups="pdk" />
   <project path="external/neven" name="platform/external/neven" groups="pdk" />
+  <project path="external/newfs_msdos" name="platform/external/newfs_msdos" groups="pdk" />
   <project path="external/nfacct" name="platform/external/nfacct" groups="pdk" />
   <project path="external/nist-pkits" name="platform/external/nist-pkits" groups="pdk" />
   <project path="external/nist-sip" name="platform/external/nist-sip" groups="pdk" />
-  <project path="external/nos/host/android" name="platform/external/nos/host/android" groups="pdk" />
-  <project path="external/nos/host/generic" name="platform/external/nos/host/generic" groups="pdk" />
-  <project path="external/nos/test/system-test-harness" name="platform/external/nos/test/system-test-harness" groups="pdk" />
+  <project path="external/nos/host/generic" name="platform/external/nos/host/generic" groups="pixel" />
   <project path="external/noto-fonts" name="platform/external/noto-fonts" groups="pdk" />
   <project path="external/oauth" name="platform/external/oauth" groups="pdk" />
   <project path="external/objenesis" name="platform/external/objenesis" groups="pdk" />
   <project path="external/oj-libjdwp" name="platform/external/oj-libjdwp" groups="pdk" />
   <project path="external/okhttp" name="platform/external/okhttp" groups="pdk" />
   <project path="external/one-true-awk" name="platform/external/one-true-awk" groups="pdk" />
+  <project path="external/opencensus-java" name="platform/external/opencensus-java" groups="pdk,tradefed" />
+  <project path="external/openssh" name="platform/external/openssh" groups="pdk" />
   <project path="external/owasp/sanitizer" name="platform/external/owasp/sanitizer" groups="pdk" />
   <project path="external/parameter-framework" name="platform/external/parameter-framework" groups="pdk" />
   <project path="external/pcre" name="platform/external/pcre" groups="pdk" />
@@ -294,14 +318,23 @@
   <project path="external/ppp" name="platform/external/ppp" groups="pdk" />
   <project path="external/proguard" name="platform/external/proguard" groups="pdk" />
   <project path="external/protobuf" name="platform/external/protobuf" groups="pdk" />
+  <project path="external/protobuf-javalite" name="platform/external/protobuf-javalite" groups="pdk" />
   <project path="external/puffin" name="platform/external/puffin" groups="pdk" />
+  <project path="external/python/apitools" name="platform/external/python/apitools" groups="pdk" />
   <project path="external/python/appdirs" name="platform/external/python/appdirs" groups="vts,pdk" />
+  <project path="external/python/asn1crypto" name="platform/external/python/asn1crypto" groups="pdk" />
+  <project path="external/python/atomicwrites" name="platform/external/python/atomicwrites" groups="pdk" />
+  <project path="external/python/attrs" name="platform/external/python/attrs" groups="pdk" />
   <project path="external/python/cachetools" name="platform/external/python/cachetools" groups="vts,pdk" />
+  <project path="external/python/cffi" name="platform/external/python/cffi" groups="pdk" />
   <project path="external/python/cpython2" name="platform/external/python/cpython2" groups="pdk" />
   <project path="external/python/cpython3" name="platform/external/python/cpython3" groups="pdk" />
+  <project path="external/python/cryptography" name="platform/external/python/cryptography" groups="pdk" />
+  <project path="external/python/dateutil" name="platform/external/python/dateutil" groups="pdk" />
   <project path="external/python/dill" name="platform/external/python/dill" groups="vts,pdk" />
   <project path="external/python/enum" name="platform/external/python/enum" groups="vts,pdk" />
   <project path="external/python/enum34" name="platform/external/python/enum34" groups="vts,pdk" />
+  <project path="external/python/funcsigs" name="platform/external/python/funcsigs" groups="pdk" />
   <project path="external/python/future" name="platform/external/python/future" groups="vts,pdk" />
   <project path="external/python/futures" name="platform/external/python/futures" groups="vts,pdk" />
   <project path="external/python/gapic-google-cloud-pubsub-v1" name="platform/external/python/gapic-google-cloud-pubsub-v1" groups="vts,pdk" />
@@ -316,6 +349,8 @@
   <project path="external/python/grpcio" name="platform/external/python/grpcio" groups="vts,pdk" />
   <project path="external/python/httplib2" name="platform/external/python/httplib2" groups="vts,pdk" />
   <project path="external/python/matplotlib" name="platform/external/python/matplotlib" groups="vts,pdk" />
+  <project path="external/python/mock" name="platform/external/python/mock" groups="pdk" />
+  <project path="external/python/more-itertools" name="platform/external/python/more-itertools" groups="pdk" />
   <project path="external/python/numpy" name="platform/external/python/numpy" groups="vts,pdk" />
   <project path="external/python/oauth2client" name="platform/external/python/oauth2client" groups="vts,pdk" />
   <project path="external/python/olefile" name="platform/external/python/olefile" groups="vts,pdk" />
@@ -323,17 +358,23 @@
   <project path="external/python/parse" name="platform/external/python/parse" groups="vts,pdk" />
   <project path="external/python/Pillow" name="platform/external/python/Pillow" groups="vts,pdk" />
   <project path="external/python/ply" name="platform/external/python/ply" groups="vts,pdk" />
+  <project path="external/python/pluggy" name="platform/external/python/pluggy" groups="pdk" />
   <project path="external/python/proto-google-cloud-pubsub-v1" name="platform/external/python/proto-google-cloud-pubsub-v1" groups="vts,pdk" />
   <project path="external/python/protobuf" name="platform/external/python/protobuf" groups="vts,pdk" />
+  <project path="external/python/py" name="platform/external/python/py" groups="pdk" />
   <project path="external/python/pyasn1" name="platform/external/python/pyasn1" groups="vts,pdk" />
   <project path="external/python/pyasn1-modules" name="platform/external/python/pyasn1-modules" groups="vts,pdk" />
+  <project path="external/python/pycparser" name="platform/external/python/pycparser" groups="pdk" />
+  <project path="external/python/pyopenssl" name="platform/external/python/pyopenssl" groups="pdk" />
   <project path="external/python/pyparsing" name="platform/external/python/pyparsing" groups="vts,pdk" />
+  <project path="external/python/pytest" name="platform/external/python/pytest" groups="pdk" />
   <project path="external/python/requests" name="platform/external/python/requests" groups="vts,pdk" />
   <project path="external/python/rsa" name="platform/external/python/rsa" groups="vts,pdk" />
   <project path="external/python/scipy" name="platform/external/python/scipy" groups="vts,pdk" />
   <project path="external/python/setuptools" name="platform/external/python/setuptools" groups="vts,pdk" />
   <project path="external/python/six" name="platform/external/python/six" groups="vts,pdk" />
   <project path="external/python/uritemplates" name="platform/external/python/uritemplates" groups="vts,pdk" />
+  <project path="external/rapidjson" name="platform/external/rapidjson" groups="pdk" />
   <project path="external/rappor" name="platform/external/rappor" groups="pdk" />
   <project path="external/replicaisland" name="platform/external/replicaisland" groups="pdk" />
   <project path="external/rmi4utils" name="platform/external/rmi4utils" groups="pdk" />
@@ -341,11 +382,13 @@
   <project path="external/robolectric-shadows" name="platform/external/robolectric-shadows" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/roboto-fonts" name="platform/external/roboto-fonts" groups="pdk" />
   <project path="external/rootdev" name="platform/external/rootdev" groups="pdk" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" groups="pdk" />
+  <project path="external/Reactive-Extensions/RxCpp" name="platform/external/Reactive-Extensions/RxCpp" groups="pdk" />
   <project path="external/scapy" name="platform/external/scapy" groups="pdk-fs" />
   <project path="external/scrypt" name="platform/external/scrypt" groups="pdk" />
   <project path="external/seccomp-tests" name="platform/external/seccomp-tests" groups="pdk" />
   <project path="external/selinux" name="platform/external/selinux" groups="pdk" />
+  <project path="external/setupcompat" name="platform/external/setupcompat" groups="pdk" />
+  <project path="external/setupdesign" name="platform/external/setupdesign" groups="pdk" />
   <project path="external/sfntly" name="platform/external/sfntly" groups="pdk,qcom_msm8x26" />
   <project path="external/shaderc/spirv-headers" name="platform/external/shaderc/spirv-headers" groups="pdk" />
   <project path="external/shflags" name="platform/external/shflags" groups="pdk" />
@@ -363,46 +406,45 @@
   <project path="external/squashfs-tools" name="platform/external/squashfs-tools" groups="pdk" />
   <project path="external/strace" name="platform/external/strace" groups="pdk" />
   <project path="external/stressapptest" name="platform/external/stressapptest" groups="pdk" />
-  <project path="external/subsampling-scale-image-view" name="platform/external/subsampling-scale-image-view" clone-depth="1" />
+  <project path="external/subsampling-scale-image-view" name="platform/external/subsampling-scale-image-view" groups="pdk" clone-depth="1" />
   <project path="external/swiftshader" name="platform/external/swiftshader" groups="pdk" />
-  <project path="external/syslinux" name="platform/external/syslinux" groups="pdk" />
+  <project path="external/syzkaller" name="platform/external/syzkaller" groups="projectarch,pdk" />
   <project path="external/tagsoup" name="platform/external/tagsoup" groups="pdk" />
   <project path="external/tcpdump" name="platform/external/tcpdump" groups="pdk" />
   <project path="external/tensorflow" name="platform/external/tensorflow" groups="pdk" />
   <project path="external/testng" name="platform/external/testng" groups="pdk" />
-  <project path="external/timezonepicker-support" name="platform/external/timezonepicker-support" groups="pdk" />
   <project path="external/tinyalsa" name="platform/external/tinyalsa" groups="pdk" />
   <project path="external/tinycompress" name="platform/external/tinycompress" groups="pdk" />
   <project path="external/tinyxml" name="platform/external/tinyxml" groups="pdk" />
   <project path="external/tinyxml2" name="platform/external/tinyxml2" groups="pdk" />
   <project path="external/toolchain-utils" name="platform/external/toolchain-utils" />
   <project path="external/toybox" name="platform/external/toybox" groups="pdk" />
-  <project path="external/tpm2" name="platform/external/tpm2" groups="pdk" />
-  <project path="external/trappy" name="platform/external/trappy" groups="pdk" />
   <project path="external/tremolo" name="platform/external/tremolo" groups="pdk" />
   <project path="external/turbine" name="platform/external/turbine" groups="pdk" />
+  <project path="external/u-boot" name="platform/external/u-boot" groups="pdk" />
   <project path="external/unicode" name="platform/external/unicode" groups="pdk" />
   <project path="external/universal-tween-engine" name="platform/external/universal-tween-engine" />
+  <project path="external/ukey2" name="platform/external/ukey2" groups="pdk" />
   <project path="external/v4l2_codec2" name="platform/external/v4l2_codec2" groups="pdk" />
   <project path="external/v8" name="platform/external/v8" groups="pdk" />
-  <project path="external/valgrind" name="platform/external/valgrind" groups="pdk" />
   <project path="external/vboot_reference" name="platform/external/vboot_reference" groups="vboot,pdk-fs" />
+  <project path="external/virglrenderer" name="platform/external/virglrenderer" groups="pdk" />
   <project path="external/vixl" name="platform/external/vixl" groups="pdk" />
   <project path="external/vogar" name="platform/external/vogar" groups="pdk" />
   <project path="external/volley" name="platform/external/volley" groups="pdk" />
+  <project path="external/vulkan-headers" name="platform/external/vulkan-headers" groups="pdk" />
   <project path="external/vulkan-validation-layers" name="platform/external/vulkan-validation-layers" groups="pdk" />
   <project path="external/walt" name="platform/external/walt" groups="pdk" />
   <project path="external/wayland" name="platform/external/wayland" groups="pdk" />
   <project path="external/wayland-protocols" name="platform/external/wayland-protocols" groups="pdk" />
   <project path="external/webp" name="platform/external/webp" groups="pdk,qcom_msm8x26" />
   <project path="external/webrtc" name="platform/external/webrtc" groups="pdk" />
-  <project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" groups="pdk" />
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" groups="pdk" />
   <project path="external/wycheproof" name="platform/external/wycheproof" groups="pdk" />
-  <project path="external/x264" name="platform/external/x264" groups="pdk" />
-  <project path="external/xmlrpcpp" name="platform/external/xmlrpcpp" groups="pdk" />
   <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" groups="pdk" />
   <project path="external/xz-embedded" name="platform/external/xz-embedded" groups="pdk" />
+  <project path="external/xz-java" name="platform/external/xz-java" groups="pdk" />
+  <project path="external/yapf" name="platform/external/yapf" groups="vts,projectarch,pdk" />
   <project path="external/zlib" name="platform/external/zlib" groups="pdk" />
   <project path="external/zopfli" name="platform/external/zopfli" groups="pdk" />
   <project path="external/zxing" name="platform/external/zxing" groups="pdk" />
@@ -411,7 +453,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" groups="pdk" />
   <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" groups="pdk" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" groups="pdk" />
-  <project path="frameworks/data-binding" name="platform/frameworks/data-binding" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/ex" name="platform/frameworks/ex" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/hardware/interfaces" name="platform/frameworks/hardware/interfaces" groups="pdk" />
   <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" groups="pdk-cw-fs,pdk-fs" />
@@ -426,11 +467,10 @@
   <project path="frameworks/opt/chips" name="platform/frameworks/opt/chips" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/opt/colorpicker" name="platform/frameworks/opt/colorpicker" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/opt/datetimepicker" name="platform/frameworks/opt/datetimepicker" groups="pdk-cw-fs,pdk-fs" />
-  <project path="frameworks/opt/inputconnectioncommon" name="platform/frameworks/opt/inputconnectioncommon" groups="pdk-fs" />
-  <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" groups="pdk-cw-fs,pdk-fs" />
+  <project path="frameworks/opt/gamesdk" name="platform/frameworks/opt/gamesdk" />
   <project path="frameworks/opt/net/ethernet" name="platform/frameworks/opt/net/ethernet" groups="pdk-fs" />
+  <project path="frameworks/opt/net/ike" name="platform/frameworks/opt/net/ike" groups="pdk" />
   <project path="frameworks/opt/net/ims" name="platform/frameworks/opt/net/ims" groups="frameworks_ims,pdk-cw-fs,pdk-fs" />
-  <project path="frameworks/opt/net/lowpan" name="platform/frameworks/opt/net/lowpan" groups="pdk-fs" />
   <project path="frameworks/opt/net/voip" name="platform/frameworks/opt/net/voip" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/opt/net/wifi" name="platform/frameworks/opt/net/wifi" groups="pdk" />
   <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" groups="pdk-cw-fs,pdk-fs" />
@@ -439,34 +479,20 @@
   <project path="frameworks/opt/timezonepicker" name="platform/frameworks/opt/timezonepicker" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/rs" name="platform/frameworks/rs" groups="pdk" />
-  <project path="frameworks/support" name="platform/frameworks/support" groups="pdk-cw-fs,pdk-fs" />
   <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" groups="pdk-cw-fs,pdk-fs" />
-  <project path="hardware/akm" name="platform/hardware/akm" groups="pdk" />
   <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="pdk" />
   <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="pdk,broadcom_wlan" />
   <project path="hardware/google/apf" name="platform/hardware/google/apf" groups="pdk" />
+  <project path="hardware/google/av" name="platform/hardware/google/av" groups="pdk" />
   <project path="hardware/google/easel" name="platform/hardware/google/easel" groups="pdk,easel" />
   <project path="hardware/google/interfaces" name="platform/hardware/google/interfaces" groups="pdk" />
-  <project path="hardware/google/av" name="platform/hardware/google/av" groups="pdk" />
-  <project path="hardware/intel/audio_media" name="platform/hardware/intel/audio_media" groups="intel,pdk" />
-  <project path="hardware/intel/bootstub" name="platform/hardware/intel/bootstub" groups="intel,pdk" />
-  <project path="hardware/intel/common/bd_prov" name="platform/hardware/intel/common/bd_prov" groups="intel,pdk" />
-  <project path="hardware/intel/common/libmix" name="platform/hardware/intel/common/libmix" groups="intel,pdk" />
-  <project path="hardware/intel/common/libstagefrighthw" name="platform/hardware/intel/common/libstagefrighthw" groups="intel,pdk" />
-  <project path="hardware/intel/common/libva" name="platform/hardware/intel/common/libva" groups="intel,pdk" />
-  <project path="hardware/intel/common/libwsbm" name="platform/hardware/intel/common/libwsbm" groups="intel,pdk" />
-  <project path="hardware/intel/common/omx-components" name="platform/hardware/intel/common/omx-components" groups="intel,pdk" />
-  <project path="hardware/intel/common/utils" name="platform/hardware/intel/common/utils" groups="intel,pdk" />
-  <project path="hardware/intel/common/wrs_omxil_core" name="platform/hardware/intel/common/wrs_omxil_core" groups="intel,pdk" />
-  <project path="hardware/intel/img/hwcomposer" name="platform/hardware/intel/img/hwcomposer" groups="intel,pdk" />
-  <project path="hardware/intel/img/psb_headers" name="platform/hardware/intel/img/psb_headers" groups="intel,pdk" />
-  <project path="hardware/intel/img/psb_video" name="platform/hardware/intel/img/psb_video" groups="intel,pdk" />
-  <project path="hardware/intel/sensors" name="platform/hardware/intel/sensors" groups="intel_sensors,pdk" />
+  <project path="hardware/google/pixel" name="platform/hardware/google/pixel" groups="generic_fs,pixel" />
+  <project path="hardware/google/pixel-sepolicy" name="platform/hardware/google/pixel-sepolicy" groups="generic_fs,pixel" />
   <project path="hardware/interfaces" name="platform/hardware/interfaces" groups="pdk" />
   <project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense,pdk" />
+  <project path="hardware/knowles/athletico/sound_trigger_hal" name="platform/hardware/knowles/athletico/sound_trigger_hal" groups="coral" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk" />
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="pdk" />
-  <project path="hardware/marvell/bt" name="platform/hardware/marvell/bt" groups="marvell_bt,pdk" />
   <project path="hardware/nxp/nfc" name="platform/hardware/nxp/nfc" groups="pdk" />
   <project path="hardware/nxp/secure_element" name="platform/hardware/nxp/secure_element" groups="pdk" />
   <project path="hardware/qcom/audio" name="platform/hardware/qcom/audio" groups="qcom,qcom_audio,pdk-qcom" />
@@ -488,20 +514,33 @@
   <project path="hardware/qcom/msm8x84" name="platform/hardware/qcom/msm8x84" groups="qcom_msm8x84,pdk-qcom" />
   <project path="hardware/qcom/neuralnetworks/hvxservice" name="platform/hardware/qcom/neuralnetworks/hvxservice" groups="wahoo" />
   <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom,pdk-qcom" />
-  <project path="hardware/qcom/sdm845/bt" name="platform/hardware/qcom/sdm845/bt" groups="qcom_sdm845" />
-  <project path="hardware/qcom/sdm845/data/ipacfg-mgr" name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" groups="vendor,qcom_sdm845" >
+  <project path="hardware/qcom/sdm845/bt" name="platform/hardware/qcom/sdm845/bt" groups="generic_fs,qcom_sdm845" />
+  <project path="hardware/qcom/sdm845/data/ipacfg-mgr" name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" groups="generic_fs,vendor,qcom_sdm845" >
     <linkfile src="os_pickup.mk" dest="hardware/qcom/sdm845/Android.mk" />
-    <linkfile dest="hardware/qcom/sdm845/Android.bp" src="os_pickup.bp" />
+    <linkfile src="os_pickup.bp" dest="hardware/qcom/sdm845/Android.bp" />
   </project>
-  <project path="hardware/qcom/sdm845/display" name="platform/hardware/qcom/sdm845/display" groups="qcom_sdm845" />
-  <project path="hardware/qcom/sdm845/gps" name="platform/hardware/qcom/sdm845/gps" groups="qcom_sdm845" />
-  <project path="hardware/qcom/sdm845/media" name="platform/hardware/qcom/sdm845/media" groups="qcom_sdm845" />
-  <project path="hardware/qcom/sdm845/thermal" name="platform/hardware/qcom/sdm845/thermal" groups="qcom_sdm845" />
-  <project path="hardware/qcom/sdm845/vr" name="platform/hardware/qcom/sdm845/vr" groups="qcom_sdm845" />
+  <project path="hardware/qcom/sdm845/display" name="platform/hardware/qcom/sdm845/display" groups="generic_fs,qcom_sdm845" />
+  <project path="hardware/qcom/sdm845/gps" name="platform/hardware/qcom/sdm845/gps" groups="generic_fs,qcom_sdm845" />
+  <project path="hardware/qcom/sdm845/media" name="platform/hardware/qcom/sdm845/media" groups="generic_fs,qcom_sdm845" />
+  <project path="hardware/qcom/sdm845/thermal" name="platform/hardware/qcom/sdm845/thermal" groups="generic_fs,qcom_sdm845" />
+  <project path="hardware/qcom/sdm845/vr" name="platform/hardware/qcom/sdm845/vr" groups="generic_fs,qcom_sdm845" />
+  <project path="hardware/qcom/sm8150/data/ipacfg-mgr" name="platform/hardware/qcom/sm8150/data/ipacfg-mgr" groups="qcom_sm8150" >
+    <linkfile src="os_pickup.mk" dest="hardware/qcom/sm8150/Android.mk" />
+    <linkfile src="os_pickup.bp" dest="hardware/qcom/sm8150/Android.bp" />
+  </project>
+  <project path="hardware/qcom/sm8150/display" name="platform/hardware/qcom/sm8150/display" groups="qcom_sm8150" />
+  <project path="hardware/qcom/sm8150/gps" name="platform/hardware/qcom/sm8150/gps" groups="qcom_sm8150" />
+  <project path="hardware/qcom/sm8150/media" name="platform/hardware/qcom/sm8150/media" groups="qcom_sm8150" />
+  <project path="hardware/qcom/sm8150/thermal" name="platform/hardware/qcom/sm8150/thermal" groups="qcom_sm8150" />
+  <project path="hardware/qcom/sm8150/vr" name="platform/hardware/qcom/sm8150/vr" groups="qcom_sm8150" />
   <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan,pdk-qcom" />
   <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" />
+  <project path="hardware/st/nfc" name="platform/hardware/st/nfc" groups="pdk" />
+  <project path="hardware/st/secure_element" name="platform/hardware/st/secure_element" groups="pdk" />
+  <project path="hardware/ti/am57x" name="platform/hardware/ti/am57x" groups="pdk" />
+  <project path="kernel/build" name="kernel/build" />
   <project path="kernel/configs" name="kernel/configs" groups="vts,pdk" />
-  <project path="kernel/tests" name="kernel/tests" />
+  <project path="kernel/tests" name="kernel/tests" groups="vts,pdk" />
   <project path="libcore" name="platform/libcore" groups="pdk" />
   <project path="libnativehelper" name="platform/libnativehelper" groups="pdk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="pdk-cw-fs,pdk-fs" />
@@ -509,20 +548,25 @@
   <project path="packages/apps/Browser2" name="platform/packages/apps/Browser2" groups="pdk-fs" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" groups="pdk-fs" />
   <project path="packages/apps/Camera2" name="platform/packages/apps/Camera2" groups="pdk-fs" />
+  <project path="packages/apps/Car/Cluster" name="platform/packages/apps/Car/Cluster" groups="pdk-fs" />
   <project path="packages/apps/Car/Dialer" name="platform/packages/apps/Car/Dialer" groups="pdk-fs" />
   <project path="packages/apps/Car/Hvac" name="platform/packages/apps/Car/Hvac" groups="pdk-fs" />
   <project path="packages/apps/Car/LatinIME" name="platform/packages/apps/Car/LatinIME" groups="pdk-fs" />
   <project path="packages/apps/Car/Launcher" name="platform/packages/apps/Car/Launcher" groups="pdk-fs" />
   <project path="packages/apps/Car/LensPicker" name="platform/packages/apps/Car/LensPicker" groups="pdk-fs" />
+  <project path="packages/apps/Car/LinkViewer" name="platform/packages/apps/Car/LinkViewer" groups="pdk-fs" />
   <project path="packages/apps/Car/LocalMediaPlayer" name="platform/packages/apps/Car/LocalMediaPlayer" groups="pdk-fs" />
   <project path="packages/apps/Car/Media" name="platform/packages/apps/Car/Media" groups="pdk-fs" />
   <project path="packages/apps/Car/Messenger" name="platform/packages/apps/Car/Messenger" groups="pdk-fs" />
+  <project path="packages/apps/Car/Notification" name="platform/packages/apps/Car/Notification" groups="pdk-fs" />
   <project path="packages/apps/Car/Overview" name="platform/packages/apps/Car/Overview" groups="pdk-fs" />
   <project path="packages/apps/Car/Radio" name="platform/packages/apps/Car/Radio" groups="pdk-fs" />
   <project path="packages/apps/Car/Settings" name="platform/packages/apps/Car/Settings" groups="pdk-fs" />
   <project path="packages/apps/Car/Stream" name="platform/packages/apps/Car/Stream" groups="pdk-fs" />
   <project path="packages/apps/Car/SystemUpdater" name="platform/packages/apps/Car/SystemUpdater" groups="pdk-fs" />
+  <project path="packages/apps/Car/externallibs" name="platform/packages/apps/Car/externallibs" groups="pdk-fs" />
   <project path="packages/apps/Car/libs" name="platform/packages/apps/Car/libs" groups="pdk-fs" />
+  <project path="packages/apps/Car/tests" name="platform/packages/apps/Car/tests" groups="pdk-fs" />
   <project path="packages/apps/CarrierConfig" name="platform/packages/apps/CarrierConfig" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" groups="pdk-cw-fs,pdk-fs" />
@@ -533,12 +577,10 @@
   <project path="packages/apps/DocumentsUI" name="platform/packages/apps/DocumentsUI" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/Email" name="platform/packages/apps/Email" groups="pdk-fs" />
   <project path="packages/apps/EmergencyInfo" name="platform/packages/apps/EmergencyInfo" groups="pdk-fs" />
-  <project path="packages/apps/ExactCalculator" name="platform/packages/apps/ExactCalculator" groups="pdk-fs" />
   <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" groups="pdk-fs" />
   <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" groups="pdk-fs" />
   <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" groups="pdk-fs" />
   <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" groups="pdk-fs" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" groups="pdk-fs" />
   <project path="packages/apps/Launcher3" name="platform/packages/apps/Launcher3" groups="pdk-fs" />
   <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" groups="pdk-fs" />
   <project path="packages/apps/ManagedProvisioning" name="platform/packages/apps/ManagedProvisioning" groups="pdk-fs" />
@@ -547,12 +589,13 @@
   <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" groups="pdk-fs" />
   <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" groups="apps_nfc,pdk-fs" />
   <project path="packages/apps/OneTimeInitializer" name="platform/packages/apps/OneTimeInitializer" groups="pdk-fs" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" groups="pdk-cw-fs,pdk-fs" />
+  <project path="packages/apps/PermissionController" name="platform/packages/apps/PackageInstaller" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/PhoneCommon" name="platform/packages/apps/PhoneCommon" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/Protips" name="platform/packages/apps/Protips" groups="pdk-fs" />
   <project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="pdk-fs" />
   <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" groups="pdk-fs" />
   <project path="packages/apps/SafetyRegulatoryInfo" name="platform/packages/apps/SafetyRegulatoryInfo" groups="pdk-fs" />
+  <project path="packages/apps/SampleLocationAttribution" name="platform/packages/apps/SampleLocationAttribution" groups="pdk-fs" />
   <project path="packages/apps/SecureElement" name="platform/packages/apps/SecureElement" groups="apps_se,pdk-fs" />
   <project path="packages/apps/Settings" name="platform/packages/apps/Settings" groups="pdk-fs" />
   <project path="packages/apps/SettingsIntelligence" name="platform/packages/apps/SettingsIntelligence" groups="pdk-fs" />
@@ -565,14 +608,21 @@
   <project path="packages/apps/Test/connectivity" name="platform/packages/apps/Test/connectivity" groups="pdk" />
   <project path="packages/apps/TimeZoneData" name="platform/packages/apps/TimeZoneData" groups="pdk" />
   <project path="packages/apps/TimeZoneUpdater" name="platform/packages/apps/TimeZoneUpdater" groups="pdk" />
+  <project path="packages/apps/ThemePicker" name="platform/packages/apps/ThemePicker" groups="pdk-fs" />
   <project path="packages/apps/Traceur" name="platform/packages/apps/Traceur" groups="pdk-fs" />
   <project path="packages/apps/TvSettings" name="platform/packages/apps/TvSettings" groups="pdk-fs" />
-  <project path="packages/apps/TV" name="platform/packages/apps/TV" />
+  <project path="packages/apps/TV" name="platform/packages/apps/TV" groups="pdk" />
   <project path="packages/apps/UnifiedEmail" name="platform/packages/apps/UnifiedEmail" groups="pdk-fs" />
+  <project path="packages/apps/UniversalMediaPlayer" name="platform/packages/apps/UniversalMediaPlayer" />
   <project path="packages/apps/WallpaperPicker" name="platform/packages/apps/WallpaperPicker" groups="pdk-fs"  />
-  <project path="packages/experimental" name="platform/packages/experimental" />
+  <project path="packages/apps/WallpaperPicker2" name="platform/packages/apps/WallpaperPicker2" groups="pdk-fs" />
   <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" groups="pdk-fs" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" groups="pdk-fs" />
+  <project path="packages/modules/CaptivePortalLogin" name="platform/packages/modules/CaptivePortalLogin" groups="pdk-cw-fs,pdk-fs" />
+  <project path="packages/modules/ExtServices" name="platform/packages/modules/ExtServices" groups="pdk-cw-fs,pdk-fs" />
+  <project path="packages/modules/ModuleMetadata" name="platform/packages/modules/ModuleMetadata" groups="pdk" />
+  <project path="packages/modules/NetworkPermissionConfig" name="platform/packages/modules/NetworkPermissionConfig" groups="pdk-cw-fs,pdk-fs" />
+  <project path="packages/modules/NetworkStack" name="platform/packages/modules/NetworkStack" groups="pdk-cw-fs,pdk-fs" />
+  <project path="packages/modules/TestModule" name="platform/packages/modules/TestModule" />
   <project path="packages/providers/ApplicationsProvider" name="platform/packages/providers/ApplicationsProvider" groups="pdk-fs" />
   <project path="packages/providers/BlockedNumberProvider" name="platform/packages/providers/BlockedNumberProvider" groups="pdk-fs" />
   <project path="packages/providers/BookmarkProvider" name="platform/packages/providers/BookmarkProvider" groups="pdk-fs" />
@@ -587,11 +637,10 @@
   <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" groups="pdk-fs" />
   <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" groups="pdk-fs" />
-  <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" groups="pdk-fs" />
   <project path="packages/services/BuiltInPrintService" name="platform/packages/services/BuiltInPrintService" groups="pdk-cw-fs,pdk-fs" />
+  <project path="packages/services/AlternativeNetworkAccess" name="platform/packages/services/AlternativeNetworkAccess" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/services/Car" name="platform/packages/services/Car" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/services/Mms" name="platform/packages/services/Mms" groups="pdk-cw-fs,pdk-fs" />
-  <project path="packages/services/NetworkRecommendation" name="platform/packages/services/NetworkRecommendation" groups="pdk-fs" />
   <project path="packages/services/Telecomm" name="platform/packages/services/Telecomm" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/services/Telephony" name="platform/packages/services/Telephony" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" groups="pdk-fs" />
@@ -600,14 +649,16 @@
   <project path="prebuilts/abi-dumps/ndk" name="platform/prebuilts/abi-dumps/ndk" groups="pdk-fs" clone-depth="1" />
   <project path="prebuilts/abi-dumps/vndk" name="platform/prebuilts/abi-dumps/vndk" groups="pdk-fs" clone-depth="1" />
   <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" groups="pdk-fs" clone-depth="1" />
+  <project path="prebuilts/asuite" name="platform/prebuilts/asuite" groups="pdk" clone-depth="1" />
   <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" groups="pdk" clone-depth="1" />
+  <project path="prebuilts/bundletool" name="platform/prebuilts/bundletool" groups="pdk" clone-depth="1" />
   <project path="prebuilts/checkcolor" name="platform/prebuilts/checkcolor" groups="pdk" clone-depth="1" />
   <project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" groups="pdk" clone-depth="1" />
   <project path="prebuilts/clang-tools" name="platform/prebuilts/clang-tools" groups="pdk" clone-depth="1" />
   <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" groups="pdk,darwin" clone-depth="1" />
   <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/deqp" name="platform/prebuilts/deqp" groups="pdk-fs" clone-depth="1" />
   <project path="prebuilts/devtools" name="platform/prebuilts/devtools" groups="pdk-fs" clone-depth="1" />
+  <project path="prebuilts/fuchsia_sdk" name="platform/prebuilts/fuchsia_sdk" groups="pdk-fs" clone-depth="1" />
   <project path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,darwin,arm" clone-depth="1" />
   <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" groups="pdk,darwin,arm" clone-depth="1" />
   <project path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" groups="pdk,darwin" clone-depth="1" />
@@ -615,24 +666,24 @@
   <project path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" groups="pdk,darwin,x86" clone-depth="1" />
   <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,linux,arm" clone-depth="1" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" groups="pdk,linux,arm" clone-depth="1" />
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" groups="pdk,linux" clone-depth="1" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" groups="pdk,linux" clone-depth="1" />
   <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" groups="pdk-fs" clone-depth="1" />
   <project path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" groups="pdk,linux,mips" clone-depth="1" />
   <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" groups="pdk,linux,x86" clone-depth="1" />
-  <project path="prebuilts/gdb/darwin-x86" name="platform/prebuilts/gdb/darwin-x86" groups="darwin" clone-depth="1" />
-  <project path="prebuilts/gdb/linux-x86" name="platform/prebuilts/gdb/linux-x86" groups="linux" clone-depth="1" />
+  <project path="prebuilts/gdb/darwin-x86" name="platform/prebuilts/gdb/darwin-x86" groups="darwin,pdk" clone-depth="1" />
+  <project path="prebuilts/gdb/linux-x86" name="platform/prebuilts/gdb/linux-x86" groups="linux,pdk" clone-depth="1" />
   <project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" groups="darwin,pdk,tradefed" clone-depth="1" />
   <project path="prebuilts/go/linux-x86" name="platform/prebuilts/go/linux-x86" groups="linux,pdk,tradefed" clone-depth="1" />
   <project path="prebuilts/gradle-plugin" name="platform/prebuilts/gradle-plugin" groups="pdk,pdk-cw-fs,pdk-fs" clone-depth="1" />
   <project path="prebuilts/jdk/jdk8" name="platform/prebuilts/jdk/jdk8" groups="pdk" clone-depth="1" />
   <project path="prebuilts/jdk/jdk9" name="platform/prebuilts/jdk/jdk9" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/libs/libedit" name="platform/prebuilts/libs/libedit" groups="pdk-cw-fs,pdk-fs" clone-depth="1" />
+  <project path="prebuilts/manifest-merger" name="platform/prebuilts/manifest-merger" groups="pdk" clone-depth="1" />
   <project path="prebuilts/maven_repo/android" name="platform/prebuilts/maven_repo/android" groups="pdk-cw-fs,pdk-fs" clone-depth="1" />
   <project path="prebuilts/maven_repo/bumptech" name="platform/prebuilts/maven_repo/bumptech" groups="pdk-cw-fs,pdk-fs" clone-depth="1" />
   <project path="prebuilts/maven_repo/google-play-service-client-libraries-3p" name="platform/prebuilts/maven_repo/google-play-service-client-libraries-3p" clone-depth="1" />
   <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="pdk" clone-depth="1" />
   <project path="prebuilts/ndk" name="platform/prebuilts/ndk" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/ktlint" name="platform/prebuilts/ktlint" clone-depth="1" />
+  <project path="prebuilts/ktlint" name="platform/prebuilts/ktlint" groups="pdk" clone-depth="1" />
   <project path="prebuilts/python/darwin-x86/2.7.5" name="platform/prebuilts/python/darwin-x86/2.7.5" groups="darwin,pdk,pdk-cw-fs,pdk-fs" clone-depth="1" />
   <project path="prebuilts/python/linux-x86/2.7.5" name="platform/prebuilts/python/linux-x86/2.7.5" groups="linux,pdk,pdk-cw-fs,pdk-fs" clone-depth="1" />
   <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" groups="pdk" clone-depth="1" />
@@ -640,8 +691,15 @@
   <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="pdk" clone-depth="1" />
   <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="pdk,tools" clone-depth="1" />
   <project path="prebuilts/vndk/v27" name="platform/prebuilts/vndk/v27" groups="pdk" clone-depth="1" />
-  <project path="sdk" name="platform/sdk" groups="pdk-cw-fs,pdk-fs" />
+  <project path="prebuilts/vndk/v28" name="platform/prebuilts/vndk/v28" groups="pdk" clone-depth="1" />
+  <project path="sdk" name="platform/sdk" groups="pdk-cw-fs,pdk-fs">
+    <linkfile src="current/androidx-README.md" dest="frameworks/support/README.md" />
+  </project>
+  <project path="system/apex" name="platform/system/apex" groups="pdk" />
+  <project path="system/ashmemd" name="platform/system/ashmemd" groups="pdk" />
   <project path="system/bt" name="platform/system/bt" groups="pdk" />
+  <project path="system/bpf" name="platform/system/bpf" groups="pdk" />
+  <project path="system/bpfprogs" name="platform/system/bpfprogs" groups="pdk" />
   <project path="system/ca-certificates" name="platform/system/ca-certificates" groups="pdk" />
   <project path="system/chre" name="platform/system/chre" groups="pdk" />
   <project path="system/connectivity/wificond" name="platform/system/connectivity/wificond" groups="pdk" />
@@ -649,68 +707,82 @@
   <project path="system/core" name="platform/system/core" groups="pdk" />
   <project path="system/extras" name="platform/system/extras" groups="pdk" />
   <project path="system/gatekeeper" name="platform/system/gatekeeper" groups="pdk" />
+  <project path="system/gsid" name="platform/system/gsid" groups="pdk" />
   <project path="system/hardware/interfaces" name="platform/system/hardware/interfaces" groups="pdk" />
   <project path="system/hwservicemanager" name="platform/system/hwservicemanager" groups="pdk" />
-  <project path="system/iot/attestation" name="platform/system/iot/attestation" groups="pdk" />
+  <project path="system/iorap" name="platform/system/iorap" groups="pdk" />
   <project path="system/keymaster" name="platform/system/keymaster" groups="pdk" />
   <project path="system/libfmq" name="platform/system/libfmq" groups="pdk" />
   <project path="system/libhidl" name="platform/system/libhidl" groups="pdk" />
   <project path="system/libhwbinder" name="platform/system/libhwbinder" groups="pdk" />
+  <project path="system/libsysprop" name="platform/system/libsysprop" groups="pdk" />
   <project path="system/libufdt" name="platform/system/libufdt" groups="pdk" />
   <project path="system/libvintf" name="platform/system/libvintf" groups="pdk" />
+  <project path="system/linkerconfig" name="platform/system/linkerconfig" groups="pdk" />
   <project path="system/media" name="platform/system/media" groups="pdk" />
   <project path="system/netd" name="platform/system/netd" groups="pdk" />
   <project path="system/nfc" name="platform/system/nfc" groups="pdk" />
   <project path="system/nvram" name="platform/system/nvram" groups="pdk" />
   <project path="system/security" name="platform/system/security" groups="pdk" />
   <project path="system/sepolicy" name="platform/system/sepolicy" groups="pdk" />
+  <project path="system/server_configurable_flags" name="platform/system/server_configurable_flags" groups="pdk"/>
+  <project path="system/testing/gtest_extras" name="platform/system/testing/gtest_extras" groups="pdk" />
   <project path="system/timezone" name="platform/system/timezone" groups="pdk" />
   <project path="system/tools/aidl" name="platform/system/tools/aidl" groups="pdk" />
   <project path="system/tools/hidl" name="platform/system/tools/hidl" groups="pdk" />
-  <project path="system/tpm" name="platform/system/tpm" />
+  <project path="system/tools/sysprop" name="platform/system/tools/sysprop" groups="pdk" />
+  <project path="system/tools/xsdc" name="platform/system/tools/xsdc" groups="pdk" />
   <project path="system/update_engine" name="platform/system/update_engine" groups="pdk" />
+  <project path="system/ucontainer" name="platform/system/ucontainer" groups="pdk" />
   <project path="system/vold" name="platform/system/vold" groups="pdk" />
-  <project path="test/framework" name="platform/test/framework" groups="vts,pdk" />
+  <project path="test/framework" name="platform/test/framework" groups="vts,projectarch,pdk" />
+  <project path="test/mlts/benchmark" name="platform/test/mlts/benchmark" groups="pdk" />
+  <project path="test/mlts/models" name="platform/test/mlts/models" groups="pdk" />
+  <project path="test/mts" name="platform/test/mts" />
   <project path="test/suite_harness" name="platform/test/suite_harness" groups="cts,pdk-cw-fs,pdk-fs" />
-  <project path="test/vti/alert" name="platform/test/vti/alert" groups="vts,pdk" />
-  <project path="test/vti/dashboard" name="platform/test/vti/dashboard" groups="vts,pdk" />
-  <project path="test/vti/fuzz_test_serving" name="platform/test/vti/fuzz_test_serving" groups="vts,pdk" />
-  <project path="test/vti/test_serving" name="platform/test/vti/test_serving" groups="vts,pdk" />
+  <project path="test/vti/alert" name="platform/test/vti/alert" groups="vts,projectarch,pdk" />
+  <project path="test/vti/dashboard" name="platform/test/vti/dashboard" groups="vts,projectarch,pdk" />
+  <project path="test/vti/fuzz_test_serving" name="platform/test/vti/fuzz_test_serving" groups="vts,projectarch,pdk" />
+  <project path="test/vti/test_serving" name="platform/test/vti/test_serving" groups="vts,projectarch,pdk" />
   <project path="test/vts" name="platform/test/vts" groups="vts,pdk" />
-  <project path="test/vts-testcase/fuzz" name="platform/test/vts-testcase/fuzz" groups="vts,pdk" />
+  <project path="test/vts-testcase/fuzz" name="platform/test/vts-testcase/fuzz" groups="vts,projectarch,pdk" />
   <project path="test/vts-testcase/hal" name="platform/test/vts-testcase/hal" groups="vts,pdk" />
   <project path="test/vts-testcase/hal-trace" name="platform/test/vts-testcase/hal-trace" groups="vts,pdk" />
   <project path="test/vts-testcase/kernel" name="platform/test/vts-testcase/kernel" groups="vts,pdk" />
-  <project path="test/vts-testcase/nbu" name="platform/test/vts-testcase/nbu" groups="vts,pdk" />
-  <project path="test/vts-testcase/performance" name="platform/test/vts-testcase/performance" groups="vts,pdk" />
-  <project path="test/vts-testcase/security" name="platform/test/vts-testcase/security" groups="vts,pdk" />
+  <project path="test/vts-testcase/nbu" name="platform/test/vts-testcase/nbu" groups="vts,projectarch,pdk" />
+  <project path="test/vts-testcase/performance" name="platform/test/vts-testcase/performance" groups="vts,projectarch,pdk" />
+  <project path="test/vts-testcase/security" name="platform/test/vts-testcase/security" groups="vts,projectarch,pdk" />
   <project path="test/vts-testcase/vndk" name="platform/test/vts-testcase/vndk" groups="vts,pdk" />
   <project path="toolchain/benchmark" name="toolchain/benchmark" />
-  <project path="toolchain/binutils" name="toolchain/binutils" groups="pdk" />
   <project path="toolchain/pgo-profiles" name="toolchain/pgo-profiles" groups="pdk" />
-  <project path="tools/acloud" name="platform/tools/acloud" groups="tools,vts,pdk,tradefed" />
-  <project path="tools/appbundle" name="platform/tools/appbundle" />
+  <project path="tools/acloud" name="platform/tools/acloud" groups="tools,vts,projectarch,pdk,tradefed" />
   <project path="tools/adt/idea" name="platform/tools/adt/idea" groups="notdefault,tools" />
+  <project path="tools/apifinder" name="platform/tools/apifinder" groups="pdk,tools" />
   <project path="tools/apksig" name="platform/tools/apksig" groups="pdk,tradefed" />
   <project path="tools/apkzlib" name="platform/tools/apkzlib" groups="pdk,tradefed" />
+  <project path="tools/asuite" name="platform/tools/asuite" groups="pdk" />
   <project path="tools/base" name="platform/tools/base" groups="notdefault,tools" />
   <project path="tools/build" name="platform/tools/build" groups="notdefault,tools" />
+  <project path="tools/currysrc" name="platform/tools/currysrc" groups="pdk" />
   <project path="tools/dexter" name="platform/tools/dexter" groups="tools,pdk-fs" />
+  <project path="tools/external_updater" name="platform/tools/external_updater" groups="tools" />
   <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" groups="tools" />
   <project path="tools/external/gradle" name="platform/tools/external/gradle" groups="tools" clone-depth="1" />
   <project path="tools/idea" name="platform/tools/idea" groups="notdefault,tools" />
   <project path="tools/loganalysis" name="platform/tools/loganalysis" groups="nopresubmit,pdk,tradefed" />
   <project path="tools/metalava" name="platform/tools/metalava" groups="pdk,tools" />
   <project path="tools/motodev" name="platform/tools/motodev" groups="notdefault,motodev" />
+  <project path="tools/ndkports" name="platform/tools/ndkports" groups="pdk" />
   <project path="tools/repohooks" name="platform/tools/repohooks" groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" />
+  <project path="tools/security" name="platform/tools/security" groups="pdk,tools" />
   <project path="tools/studio/cloud" name="platform/tools/studio/cloud" groups="notdefault,tools" />
   <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" />
   <project path="tools/test/connectivity" name="platform/tools/test/connectivity" groups="pdk" />
+  <project path="tools/test/graphicsbenchmark" name="platform/tools/test/graphicsbenchmark" groups="pdk" />
   <project path="tools/tradefederation/core" name="platform/tools/tradefederation" groups="pdk,tradefed" />
   <project path="tools/tradefederation/contrib" name="platform/tools/tradefederation/contrib" groups="pdk,tradefed" />
-
+  <project path="tools/trebuchet" name="platform/tools/trebuchet" groups="tools,cts,pdk,pdk-cw-fs,pdk-fs" />
   <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
-
   <!-- OmniROM -->
   <include name="omni-default.xml" />
 </manifest>

omni-aosp.xml

@@ -14,10 +14,10 @@
   <remote  name="PitchBlackTWRP"
            fetch="https://github.com/PitchBlackRecoveryProject" />
 
-  <project path="art" name="android_art" remote="omnirom" revision="android-9.0" groups="pdk" />
-  <project path="bionic" name="android_bionic" remote="omnirom" revision="android-9.0" groups="pdk" />
+  <project path="art" name="android_art" remote="omnirom" revision="android-10" groups="pdk" />
+  <project path="bionic" name="android_bionic" remote="omnirom" revision="android-10" groups="pdk" />
 
-  <project path="build/make" name="android_build" remote="PitchBlackTWRP" revision="android-9.0" groups="pdk" >
+  <project path="build/make" name="android_build" remote="PitchBlackTWRP" revision="android-10.0" groups="pdk" >
     <copyfile src="core/root.mk" dest="Makefile" />
     <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
     <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
@@ -26,80 +26,86 @@
     <linkfile src="target" dest="build/target" />
     <linkfile src="tools" dest="build/tools" />
   </project>
-  <project path="build/soong" name="android_build_soong" remote="omnirom" revision="android-9.0" >
+  <project path="build/soong" name="android_build_soong" remote="PitchBlackTWRP" revision="android-10.0" >
       <linkfile src="root.bp" dest="Android.bp" />
       <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
   </project>
 
-  <project path="development" name="android_development" remote="omnirom" revision="android-9.0" groups="pdk-cw-fs,pdk-fs" />
+  <!-- <project path="development" name="android_development" remote="omnirom" revision="android-9.0" groups="pdk-cw-fs,pdk-fs" /> -->
 
-  <project path="external/aac" name="android_external_aac" remote="omnirom" revision="android-9.0" />
-  <project path="external/e2fsprogs" name="android_external_e2fsprogs" remote="omnirom" revision="android-9.0" />
-  <project path="external/f2fs-tools" name="android_external_f2fs-tools" remote="omnirom" revision="android-9.0" />
-  <project path="external/mksh" name="android_external_mksh" remote="omnirom" revision="android-9.0" />
-  <project path="external/tinycompress" name="android_external_tinycompress" remote="omnirom" revision="android-9.0" />
-  <project path="external/selinux" name="android_external_selinux" remote="omnirom" revision="android-9.0" />
-  <project path="external/skia" name="android_external_skia" remote="omnirom" revision="android-9.0" />
-  <project path="external/toybox" name="android_external_toybox" remote="omnirom" revision="android-9.0" />
+  <project path="external/aac" name="android_external_aac" remote="omnirom" revision="android-10" />
+  <project path="external/e2fsprogs" name="android_external_e2fsprogs" remote="omnirom" revision="android-10" />
+  <project path="external/f2fs-tools" name="android_external_f2fs-tools" remote="omnirom" revision="android-10" />
+  <!--<project path="external/mksh" name="android_external_mksh" remote="omnirom" revision="android-9.0" /> -->
+  <!--<project path="external/tinycompress" name="android_external_tinycompress" remote="omnirom" revision="android-9.0" /> -->
+  <project path="external/selinux" name="android_external_selinux" remote="omnirom" revision="android-10" />
+  <!--<project path="external/skia" name="android_external_skia" remote="omnirom" revision="android-9.0" /> -->
+  <project path="external/toybox" name="android_external_toybox" remote="omnirom" revision="android-10" />
 
-  <project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-9.0" />
-  <project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-9.0" />
-  <project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-9.0" />
-  <project path="frameworks/opt/telephony" name="android_frameworks_opt_telephony" remote="omnirom" revision="android-9.0" />
-  <project path="frameworks/opt/net/wifi" name="android_frameworks_opt_net_wifi" remote="omnirom" revision="android-9.0" />
-  <project path="frameworks/opt/net/ims" name="android_frameworks_opt_net_ims" remote="omnirom" revision="android-9.0" />
+  <project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-10" />
+  <project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-10" />
+  <project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-10" />
+  <project path="frameworks/opt/chips" name="android_frameworks_opt_chips" remote="omnirom" revision="android-10" />
+  <project path="frameworks/opt/telephony" name="android_frameworks_opt_telephony" remote="omnirom" revision="android-10" />
+  <project path="frameworks/opt/net/wifi" name="android_frameworks_opt_net_wifi" remote="omnirom" revision="android-10" /> -->
+  <project path="frameworks/opt/net/ims" name="android_frameworks_opt_net_ims" remote="omnirom" revision="android-10" />
 
-  <project path="hardware/interfaces" name="android_hardware_interfaces" remote="omnirom" revision="android-9.0" />
-  <project path="hardware/invensense" name="android_hardware_invensense" remote="omnirom" revision="android-9.0" />
-  <project path="hardware/libhardware" name="android_hardware_libhardware" remote="omnirom" revision="android-9.0" />
-  <project path="hardware/libhardware_legacy" name="android_hardware_libhardware_legacy" remote="omnirom" revision="android-9.0" groups="pdk" />
+  <project path="hardware/interfaces" name="android_hardware_interfaces" remote="omnirom" revision="android-10" />
+  <!--<project path="hardware/invensense" name="android_hardware_invensense" remote="omnirom" revision="android-9.0" /> -->
+  <project path="hardware/libhardware" name="android_hardware_libhardware" remote="omnirom" revision="android-10" />
+  <project path="hardware/libhardware_legacy" name="android_hardware_libhardware_legacy" remote="omnirom" revision="android-10" groups="pdk" />
 
-  <project path="hardware/nxp/nfc" name="android_hardware_nxp_nfc" remote="omnirom" revision="android-9.0" />
+  <project path="hardware/nxp/nfc" name="android_hardware_nxp_nfc" remote="omnirom" revision="android-10" />
 
-  <project path="hardware/qcom/audio" name="android_hardware_qcom_audio" remote="omnirom" revision="android-9.0" />
-  <project path="hardware/qcom/bt" name="android_hardware_qcom_bt" remote="omnirom" revision="android-9.0" />
-  <project path="hardware/qcom/display" name="android_hardware_qcom_display" remote="omnirom" revision="android-9.0" />
-  <project path="hardware/qcom/media" name="android_hardware_qcom_media" remote="omnirom" revision="android-9.0" />
-  <project path="hardware/qcom/msm8998" name="android_hardware_qcom_msm8998" remote="omnirom" revision="android-9.0" />
-  <project path="hardware/qcom/power" name="android_hardware_qcom_power" remote="omnirom" revision="android-9.0" />
-  <project path="hardware/qcom/wlan" name="android_hardware_qcom_wlan" remote="omnirom" revision="android-9.0" />
+  <!--<project path="hardware/qcom/audio" name="android_hardware_qcom_audio" remote="omnirom" revision="android-9.0" /> -->
+  <!-- <project path="hardware/qcom/bt" name="android_hardware_qcom_bt" remote="omnirom" revision="android-9.0" /> -->
+  <!--<project path="hardware/qcom/display" name="android_hardware_qcom_display" remote="omnirom" revision="android-9.0" /> -->
+  <!--<project path="hardware/qcom/media" name="android_hardware_qcom_media" remote="omnirom" revision="android-9.0" /> -->
+  <!--<project path="hardware/qcom/msm8998" name="android_hardware_qcom_msm8998" remote="omnirom" revision="android-9.0" /> -->
+  <!--<project path="hardware/qcom/power" name="android_hardware_qcom_power" remote="omnirom" revision="android-9.0" /> -->
+  <project path="hardware/qcom/wlan" name="android_hardware_qcom_wlan" remote="omnirom" revision="android-10" />
 
-  <project path="packages/apps/Bluetooth" name="android_packages_apps_Bluetooth" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Calendar" name="android_packages_apps_Calendar" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/CellBroadcastReceiver" name="android_packages_apps_CellBroadcastReceiver" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Dialer" name="android_packages_apps_Dialer" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/DocumentsUI" name="android_packages_apps_DocumentsUI" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/EmergencyInfo" name="android_packages_apps_EmergencyInfo" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/MusicFX" name="android_packages_apps_MusicFX" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Nfc" name="android_packages_apps_Nfc" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/PhoneCommon" name="android_packages_apps_PhoneCommon" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/SettingsIntelligence" name="android_packages_apps_SettingsIntelligence" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Stk" name="android_packages_apps_Stk" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Tag" name="android_packages_apps_Tag" remote="omnirom" revision="android-9.0" />
+  <project path="packages/apps/Bluetooth" name="android_packages_apps_Bluetooth" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/Calendar" name="android_packages_apps_Calendar" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/CellBroadcastReceiver" name="android_packages_apps_CellBroadcastReceiver" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/Dialer" name="android_packages_apps_Dialer" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/DocumentsUI" name="android_packages_apps_DocumentsUI" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/ExactCalculator" name="platform/packages/apps/ExactCalculator" groups="pdk-fs" revision="refs/tags/android-9.0.0_r50" />
+  <!--<project path="packages/apps/EmergencyInfo" name="android_packages_apps_EmergencyInfo" remote="omnirom" revision="android-9.0" /> -->
+  <project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/MusicFX" name="android_packages_apps_MusicFX" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/Nfc" name="android_packages_apps_Nfc" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/PackageInstaller" name="android_packages_apps_PackageInstaller" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/PhoneCommon" name="android_packages_apps_PhoneCommon" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/SettingsIntelligence" name="android_packages_apps_SettingsIntelligence" remote="omnirom" revision="android-10" />
+  <!--<project path="packages/apps/Stk" name="android_packages_apps_Stk" remote="omnirom" revision="android-9.0" /> -->
+  <!--<project path="packages/apps/Tag" name="android_packages_apps_Tag" remote="omnirom" revision="android-9.0" /> -->
+  <project path="packages/apps/ThemePicker" name="android_packages_apps_ThemePicker" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/WallpaperPicker2" name="android_packages_apps_WallpaperPicker2" remote="omnirom" revision="android-10" />
 
-  <project path="packages/inputmethods/LatinIME" name="android_packages_inputmethods_LatinIME" remote="omnirom" revision="android-9.0" />
+  <project path="packages/inputmethods/LatinIME" name="android_packages_inputmethods_LatinIME" remote="omnirom" revision="android-10" />
 
-  <project path="packages/providers/DownloadProvider" name="android_packages_providers_DownloadProvider" remote="omnirom" revision="android-9.0" />
+  <project path="packages/providers/DownloadProvider" name="android_packages_providers_DownloadProvider" remote="omnirom" revision="android-10" />
+  <project path="packages/providers/MediaProvider" name="android_packages_providers_MediaProvider" remote="omnirom" revision="android-10" />
 
-  <project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-9.0" />
-  <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-9.0" />
+  <project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-10" />
+  <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-10" />
 
-  <project path="prebuilts/build-tools" name="android_prebuilts_build-tools" remote="omnirom" revision="android-9.0" />
+  <!--<project path="prebuilts/build-tools" name="android_prebuilts_build-tools" remote="omnirom" revision="android-9.0" /> -->
 
-  <project path="system/bt" name="android_system_bt" remote="omnirom" revision="android-9.0" />
-  <project path="system/core" name="android_system_core" remote="omnirom" revision="android-9.0" />
-  <project path="system/extras" name="android_system_extras" remote="omnirom" revision="android-9.0" />
-  <project path="system/libhidl" name="android_system_libhidl" remote="omnirom" revision="android-9.0" />
-  <project path="system/media" name="android_system_media" remote="omnirom" revision="android-9.0" />
-  <project path="system/nfc" name="android_system_nfc" remote="omnirom" revision="android-9.0" />
-  <project path="system/netd" name="android_system_netd" remote="omnirom" revision="android-9.0" />
-  <project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-9.0" />
-  <project path="system/vold" name="android_system_vold" remote="omnirom" revision="android-9.0" />
-  <project path="system/hardware/interfaces" name="android_system_hardware_interfaces" remote="omnirom" revision="android-9.0" />
-  <project path="system/update_engine" name="android_system_update_engine" remote="omnirom" revision="android-9.0" />
+  <project path="system/bpf" name="android_system_bpf" remote="omnirom" revision="android-10" /> -->
+  <project path="system/bt" name="android_system_bt" remote="omnirom" revision="android-10" />
+  <project path="system/core" name="android_system_core" remote="omnirom" revision="android-10" />
+  <project path="system/extras" name="android_system_extras" remote="omnirom" revision="android-10" />
+  <project path="system/libhidl" name="android_system_libhidl" remote="omnirom" revision="android-10" />
+  <project path="system/media" name="android_system_media" remote="omnirom" revision="android-10" />
+  <project path="system/nfc" name="android_system_nfc" remote="omnirom" revision="android-10" />
+  <project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-10" />
+  <project path="system/vold" name="android_system_vold" remote="omnirom" revision="android-10" />
+  <project path="system/hardware/interfaces" name="android_system_hardware_interfaces" remote="omnirom" revision="android-10" />
+  <project path="system/update_engine" name="android_system_update_engine" remote="omnirom" revision="android-10" />
 </manifest>

omni-caf.xml

@@ -10,8 +10,9 @@
 
   <project path="external/libnetfilter_conntrack" name="android_external_libnetfilter_conntrack" remote="omnirom" revision="android-9.0" />
   <project path="external/libnfnetlink" name="android_external_libnfnetlink" remote="omnirom" revision="android-9.0" />
-  <project path="hardware/ril" name="android_hardware_ril" remote="omnirom" revision="android-9.0" />
-  <project path="vendor/codeaurora/telephony" name="android_vendor_codeaurora_telephony" remote="omnirom" revision="android-9.0" />
-  <project path="vendor/qcom/opensource/commonsys" name="android_vendor_qcom_opensource_commonsys" remote="omnirom" revision="android-9.0" />
-  <project path="vendor/qcom/opensource/interfaces" name="android_vendor_qcom_opensource_interfaces" remote="omnirom" revision="android-9.0" />
+  <project path="hardware/ril" name="android_hardware_ril" remote="omnirom" revision="android-10" />
+  <project path="vendor/codeaurora/telephony" name="android_vendor_codeaurora_telephony" remote="omnirom" revision="android-10" />
+  <project path="vendor/qcom/opensource/interfaces" name="android_vendor_qcom_opensource_interfaces" remote="omnirom" revision="android-10" />
+  <project path="vendor/qcom/opensource/display-commonsys-intf" name="android_vendor_qcom_opensource_display-commonsys-intf" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/DeskClock" name="android_packages_apps_DeskClock" remote="omnirom" revision="android-10" />
 </manifest>

omni-default.xml

@@ -9,38 +9,33 @@
   <!-- Include forked CAF -->
   <include name="omni-caf.xml" />
 
+  <!-- include registered repos -->
+  <include name="omni-private.xml" />
+
   <!-- OmniROM Projects -->
-  <project path="android" name="android" remote="omnirom" revision="android-9.0" />
+  <project path="android" name="android" remote="omnirom" revision="android-10" />
 
-  <!--<project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-9.0" />-->
-  <project path="vendor/interfaces" name="android_vendor_interfaces" remote="omnirom" revision="android-9.0" />
+  <project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-10" />
+  <project path="vendor/interfaces" name="android_vendor_interfaces" remote="omnirom" revision="android-10" />
 
-  <project path="external/bash" name="android_external_bash" remote="omnirom" revision="android-9.0" />
-  <project path="external/exfat" name="android_external_exfat" remote="omnirom" revision="android-8.1" />
-  <project path="external/fuse" name="android_external_fuse" remote="omnirom" revision="android-8.0" />
-  <project path="external/htop" name="android_external_htop" remote="omnirom" revision="android-9.0" />
-  <project path="external/libncurses" name="android_external_libncurses" remote="omnirom" revision="android-9.0" />
-  <project path="external/nano" name="android_external_nano" remote="omnirom" revision="android-9.0" />
-  <project path="external/ntfs-3g" name="android_external_ntfs-3g" remote="omnirom" revision="android-9.0"/>
-  <project path="external/openssh" name="android_external_openssh" remote="omnirom" revision="android-9.0" />
-  <project path="external/powertop" name="android_external_powertop" remote="omnirom" revision="android-9.0" />
-  <project path="external/rsync" name="android_external_rsync" remote="omnirom" revision="android-9.0" />
-  <project path="external/vim" name="android_external_vim" remote="omnirom" revision="android-9.0" />
+  <project path="external/bash" name="android_external_bash" remote="omnirom" revision="android-10" />
+  <project path="external/exfat" name="android_external_exfat" remote="omnirom" revision="android-10" />-->
+  <project path="external/htop" name="android_external_htop" remote="omnirom" revision="android-10" />
+  <project path="external/libncurses" name="android_external_libncurses" remote="omnirom" revision="android-10" />
+  <!--<project path="external/nano" name="android_external_nano" remote="omnirom" revision="android-9.0" />-->
+  <!--<project path="external/ntfs-3g" name="android_external_ntfs-3g" remote="omnirom" revision="android-9.0"/>-->
+  <!--<project path="external/openssh" name="android_external_openssh" remote="omnirom" revision="android-9.0" />-->
+  <!--<project path="external/powertop" name="android_external_powertop" remote="omnirom" revision="android-9.0" />-->
+  <!--<project path="external/rsync" name="android_external_rsync" remote="omnirom" revision="android-9.0" />-->
+  <project path="external/tigervnc" name="android_external_tigervnc" remote="omnirom" revision="android-10" />
+  <project path="external/vncflinger" name="android_external_vncflinger" remote="omnirom" revision="android-10" />
+  <project path="external/vim" name="android_external_vim" remote="omnirom" revision="android-10" />
+  <project path="external/zip" name="android_external_zip"  remote="omnirom" revision="android-10" />
 
-  <project path="packages/apps/Matlog" name="android_packages_apps_Matlog" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/MonthCalendarWidget" name="android_packages_apps_MonthCalendarWidget" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/OmniChange" name="android_packages_apps_OmniChange" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/OmniChromium" name="android_packages_apps_OmniChromium" remote="gitlab" revision="android-9.0" />
-  <project path="packages/apps/OmniClock" name="android_packages_apps_OmniClock" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/OmniGears" name="android_packages_apps_OmniGears" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/OmniBrain" name="android_packages_apps_OmniBrain" remote="omnirom" revision="android-9.0" />
-  <project path="packages/services/OmniJaws" name="android_packages_services_OmniJaws" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/OmniRecord" name="android_packages_apps_OmniRecord" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/OmniStyle" name="android_packages_apps_OmniStyle" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/OmniSwitch" name="android_packages_apps_OmniSwitch" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/OpenDelta" name="android_packages_apps_OpenDelta" remote="omnirom" revision="android-9.0" />
-  <project path="packages/apps/Phonograph" name="android_packages_apps_Phonograph" remote="omnirom" revision="android-9.0" />
+  <project path="packages/apps/Matlog" name="android_packages_apps_Matlog" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/OmniChromium" name="android_packages_apps_OmniChromium" remote="gitlab" revision="android-10" />
+  <project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-10" />
+  <project path="packages/apps/Phonograph" name="android_packages_apps_Phonograph" remote="omnirom" revision="android-10" />
 
   <!-- LAST: Remove unused/forked Projects for minimal TWRP -->
   <include name="remove-minimal.xml" />

omni-private.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote  name="omnirom2"
+           fetch="ssh://git@github.com/omnirom"
+           review="gerrit.omnirom.org" />
+
+  <!-- private OmniROM Projects -->
+  <project path="packages/apps/OmniSwitch" name="android_packages_apps_OmniSwitch" remote="omnirom2" revision="android-10" />
+  <project path="packages/apps/OpenDelta" name="android_packages_apps_OpenDelta" remote="omnirom2" revision="android-10" />
+  <project path="packages/apps/OmniGears" name="android_packages_apps_OmniGears" remote="omnirom2" revision="android-10" />
+  <project path="packages/services/OmniJaws" name="android_packages_services_OmniJaws" remote="omnirom2" revision="android-10" />
+  <project path="packages/apps/OmniStyle" name="android_packages_apps_OmniStyle" remote="omnirom2" revision="android-10" />
+  <project path="packages/apps/OmniRemote" name="android_packages_apps_OmniRemote" remote="omnirom2" revision="android-10" />
+  <project path="packages/apps/OmniChange" name="android_packages_apps_OmniChange" remote="omnirom2" revision="android-10" />
+</manifest>

remove-minimal.xml

@@ -2,11 +2,19 @@
 <manifest>
 
     <!-- Remove from default.xml -->
-    <remove-project name="platform/compatibility/cdd"/>
-    <remove-project name="platform/cts"/>
+    <!--
+    <remove-project name="device/generic/common"/>
+    <remove-project name="device/generic/goldfish"/>
+    <remove-project name="device/generic/goldfish-opengl"/>
+    -->
 
-    <remove-project name="platform/external/abi-compliance-checker"/>
-    <remove-project name="platform/external/abi-dumper"/>
+    <!--<remove-project name="kernel/configs"/>-->
+
+    <!--<remove-project name="platform/compatibility/cdd"/>-->
+    <!--<remove-project name="platform/cts"/>-->
+
+    <!--<remove-project name="platform/external/abi-compliance-checker"/>-->
+    <!--<remove-project name="platform/external/abi-dumper"/>-->
     <remove-project name="platform/external/adt-infra"/>
     <remove-project name="platform/external/android-clat"/>
     <remove-project name="platform/external/androidplot"/>
@@ -19,21 +27,21 @@
     <remove-project name="platform/external/archive-patcher"/>
     <remove-project name="platform/external/arm-neon-tests"/>
     <remove-project name="platform/external/autotest"/>
-    <remove-project name="platform/external/bart"/>
+    <!--<remove-project name="platform/external/bart"/>-->
     <remove-project name="platform/external/blktrace"/>
     <remove-project name="platform/external/caliper"/>
     <remove-project name="platform/external/cblas"/>
     <remove-project name="platform/external/chromium-libpac"/>
-    <remove-project name="platform/external/chromium-trace"/>
+    <!--<remove-project name="platform/external/chromium-trace"/>-->
     <remove-project name="platform/external/cmockery"/>
     <remove-project name="platform/external/crcalc"/>
     <remove-project name="platform/external/curl"/>
     <remove-project name="platform/external/dagger2"/>
     <remove-project name="platform/external/deqp"/>
     <remove-project name="platform/external/desugar"/>
-    <remove-project name="platform/external/devlib"/>
+    <!--<remove-project name="platform/external/devlib"/>-->
     <remove-project name="platform/external/dexmaker"/>
-    <remove-project name="platform/external/dhcpcd-6.8.2"/>
+    <!--<remove-project name="platform/external/dhcpcd-6.8.2"/>-->
     <remove-project name="platform/external/dng_sdk"/>
     <remove-project name="platform/external/dnsmasq"/>
     <remove-project name="platform/external/doclava"/>
@@ -42,23 +50,23 @@
     <remove-project name="platform/external/drrickorang"/>
     <remove-project name="platform/external/easymock"/>
     <remove-project name="platform/external/emma"/>
-    <remove-project name="platform/external/esd"/>
-    <remove-project name="platform/external/eyes-free"/>
+    <!--<remove-project name="platform/external/esd"/>-->
+    <!--<remove-project name="platform/external/eyes-free"/>-->
     <remove-project name="platform/external/fdlibm"/>
-    <remove-project name="platform/external/fio"/>
+    <!--<remove-project name="platform/external/fio"/>-->
     <remove-project name="platform/external/flatbuffers"/>
     <remove-project name="platform/external/fonttools"/>
     <remove-project name="platform/external/fsck_msdos"/>
     <remove-project name="platform/external/gemmlowp"/>
     <remove-project name="platform/external/giflib"/>
     <remove-project name="platform/external/glide"/>
-    <remove-project name="platform/external/google-api-services-storage"/>
+    <!--<remove-project name="platform/external/google-api-services-storage"/>-->
     <remove-project name="platform/external/google-breakpad"/>
     <remove-project name="platform/external/google-fonts/carrois-gothic-sc"/>
     <remove-project name="platform/external/google-fonts/coming-soon"/>
     <remove-project name="platform/external/google-fonts/cutive-mono"/>
     <remove-project name="platform/external/google-fonts/dancing-script"/>
-    <remove-project name="platform/external/google-tv-pairing-protocol"/>
+    <!--<remove-project name="platform/external/google-tv-pairing-protocol"/>-->
     <remove-project name="platform/external/guava"/>
     <remove-project name="platform/external/guice"/>
     <remove-project name="platform/external/hamcrest"/>
@@ -74,14 +82,14 @@
     <remove-project name="platform/external/jacoco"/>
     <remove-project name="platform/external/jarjar"/>
     <remove-project name="platform/external/javasqlite"/>
-    <remove-project name="platform/external/javassist"/>
+    <!--<remove-project name="platform/external/javassist"/>-->
     <remove-project name="platform/external/jcommander"/>
     <remove-project name="platform/external/jdiff"/>
     <remove-project name="platform/external/jline"/>
-    <remove-project name="platform/external/jmdns"/>
+    <!--<remove-project name="platform/external/jmdns"/>-->
     <remove-project name="platform/external/jsilver"/>
     <remove-project name="platform/external/jsmn"/>
-    <remove-project name="platform/external/jsoncpp"/>
+    <!--<remove-project name="platform/external/jsoncpp"/>-->
     <remove-project name="platform/external/jsr305"/>
     <remove-project name="platform/external/jsr330"/>
     <remove-project name="platform/external/junit"/>
@@ -91,19 +99,19 @@
     <remove-project name="platform/external/libavc"/>
     <remove-project name="platform/external/libbackup"/>
     <remove-project name="platform/external/libcap-ng"/>
-    <remove-project name="platform/external/libconstrainedcrypto"/>
+    <!--<remove-project name="platform/external/libconstrainedcrypto"/>-->
     <remove-project name="platform/external/libcups"/>
     <remove-project name="platform/external/libdaemon"/>
     <remove-project name="platform/external/libdivsufsort"/>
-    <remove-project name="platform/external/libedit"/>
+    <!--<remove-project name="platform/external/libedit"/>-->
     <remove-project name="platform/external/libese"/>
     <remove-project name="platform/external/libexif"/>
     <remove-project name="platform/external/libgsm"/>
     <remove-project name="platform/external/libhevc"/>
     <remove-project name="platform/external/libjpeg-turbo"/>
     <remove-project name="platform/external/libldac"/>
-    <remove-project name="platform/external/libmicrohttpd"/>
-    <remove-project name="platform/external/libmojo"/>
+    <!--<remove-project name="platform/external/libmicrohttpd"/>-->
+    <!--<remove-project name="platform/external/libmojo"/>-->
     <remove-project name="platform/external/libmpeg2"/>
     <remove-project name="platform/external/libmtp"/>
     <remove-project name="platform/external/libogg"/>
@@ -113,18 +121,18 @@
     <remove-project name="platform/external/libtextclassifier"/>
     <remove-project name="platform/external/libusb"/>
     <remove-project name="platform/external/libusb-compat"/>
-    <remove-project name="platform/external/libvncserver"/>
+    <!--<remove-project name="platform/external/libvncserver"/>-->
     <remove-project name="platform/external/libvpx"/>
     <remove-project name="platform/external/libvterm"/>
     <remove-project name="platform/external/libyuv"/>
     <remove-project name="platform/external/linux-kselftest"/>
-    <remove-project name="platform/external/lisa"/>
+    <!--<remove-project name="platform/external/lisa"/>-->
     <remove-project name="platform/external/lmfit"/>
     <remove-project name="platform/external/ltp"/>
     <remove-project name="platform/external/markdown"/>
     <remove-project name="platform/external/mesa3d"/>
     <remove-project name="platform/external/Microsoft-GSL"/>
-    <remove-project name="platform/external/mmc-utils"/>
+    <!--<remove-project name="platform/external/mmc-utils"/>-->
     <remove-project name="platform/external/mockftpserver"/>
     <remove-project name="platform/external/mockito"/>
     <remove-project name="platform/external/mockwebserver"/>
@@ -133,7 +141,7 @@
     <remove-project name="platform/external/nanohttpd"/>
     <remove-project name="platform/external/nanopb-c"/>
     <remove-project name="platform/external/naver-fonts"/>
-    <remove-project name="platform/external/netcat"/>
+    <!--<remove-project name="platform/external/netcat"/>-->
     <remove-project name="platform/external/neven"/>
     <remove-project name="platform/external/nfacct"/>
     <remove-project name="platform/external/nist-pkits"/>
@@ -158,7 +166,7 @@
     <remove-project name="platform/external/seccomp-tests"/>
     <remove-project name="platform/external/sfntly"/>
     <remove-project name="platform/external/shflags"/>
-    <remove-project name="android_external_skia"/>
+    <!--<remove-project name="android_external_skia"/>-->
     <remove-project name="platform/external/sl4a"/>
     <remove-project name="platform/external/slf4j"/>
     <remove-project name="platform/external/smali"/>
@@ -166,18 +174,18 @@
     <remove-project name="platform/external/sonic"/>
     <remove-project name="platform/external/sonivox"/>
     <remove-project name="platform/external/spirv-llvm"/>
-    <remove-project name="platform/external/sqlite"/>
+    <!--<remove-project name="platform/external/sqlite"/>-->
     <remove-project name="platform/external/stressapptest"/>
     <remove-project name="platform/external/swiftshader"/>
-    <remove-project name="platform/external/syslinux"/>
+    <!--<remove-project name="platform/external/syslinux"/>-->
     <remove-project name="platform/external/tagsoup"/>
     <remove-project name="platform/external/tcpdump"/>
     <remove-project name="platform/external/testng"/>
-    <remove-project name="platform/external/timezonepicker-support"/>
+    <!--<remove-project name="platform/external/timezonepicker-support"/>-->
     <remove-project name="platform/external/tinyxml"/>
     <remove-project name="platform/external/toolchain-utils"/>
-    <remove-project name="platform/external/tpm2"/>
-    <remove-project name="platform/external/trappy"/>
+    <!--<remove-project name="platform/external/tpm2"/>-->
+    <!--<remove-project name="platform/external/trappy"/>-->
     <remove-project name="platform/external/tremolo"/>
     <remove-project name="platform/external/unicode"/>
     <remove-project name="platform/external/universal-tween-engine"/>
@@ -192,8 +200,8 @@
     <remove-project name="platform/external/webrtc"/>
     <remove-project name="platform/external/wpa_supplicant_8"/>
     <remove-project name="platform/external/wycheproof"/>
-    <remove-project name="platform/external/x264"/>
-    <remove-project name="platform/external/xmlrpcpp"/>
+    <!--<remove-project name="platform/external/x264"/>-->
+    <!--<remove-project name="platform/external/xmlrpcpp"/>-->
     <remove-project name="platform/external/xmp_toolkit"/>
     <remove-project name="platform/external/zopfli"/>
     <remove-project name="platform/external/zxing"/>
@@ -202,26 +210,26 @@
     <remove-project name="platform/frameworks/ex"/>
     <remove-project name="platform/frameworks/layoutlib"/>
     <remove-project name="platform/frameworks/minikin"/>
-    <remove-project name="platform/frameworks/ml"/>
+    <!--<remove-project name="platform/frameworks/ml"/>-->
     <remove-project name="platform/frameworks/multidex"/>
     <remove-project name="platform/frameworks/opt/bitmap"/>
     <remove-project name="platform/frameworks/opt/calendar"/>
-    <remove-project name="platform/frameworks/opt/chips"/>
+    <!--<remove-project name="platform/frameworks/opt/chips"/>-->
     <remove-project name="platform/frameworks/opt/colorpicker"/>
     <remove-project name="platform/frameworks/opt/datetimepicker"/>
-    <remove-project name="platform/frameworks/opt/inputconnectioncommon"/>
-    <remove-project name="platform/frameworks/opt/inputmethodcommon"/>
+    <!--<remove-project name="platform/frameworks/opt/inputconnectioncommon"/>-->
+    <!--<remove-project name="platform/frameworks/opt/inputmethodcommon"/>-->
     <remove-project name="platform/frameworks/opt/net/ethernet"/>
-    <remove-project name="platform/frameworks/opt/net/lowpan"/>
+    <!--<remove-project name="platform/frameworks/opt/net/lowpan"/>-->
     <remove-project name="platform/frameworks/opt/net/voip"/>
     <remove-project name="platform/frameworks/opt/photoviewer"/>
     <remove-project name="platform/frameworks/opt/timezonepicker"/>
     <remove-project name="platform/frameworks/opt/vcard"/>
-    <remove-project name="platform/frameworks/support"/>
-    <remove-project name="platform/frameworks/data-binding"/>
+    <!--<remove-project name="platform/frameworks/support"/>-->
+    <!--<remove-project name="platform/frameworks/data-binding"/>-->
     <remove-project name="platform/frameworks/wilhelm"/>
 
-    <remove-project name="platform/hardware/akm"/>
+    <!--<remove-project name="platform/hardware/akm"/>-->
     <remove-project name="platform/hardware/broadcom/libbt"/>
     <remove-project name="platform/hardware/broadcom/wlan"/>
     <remove-project name="platform/hardware/google/av"/>
@@ -232,7 +240,6 @@
     <remove-project name="platform/hardware/qcom/keymaster"/>
 
     <remove-project name="platform/packages/apps/BasicSmsReceiver"/>
-    <remove-project name="platform/packages/apps/Browser2"/>
     <remove-project name="platform/packages/apps/Camera2"/>
     <remove-project name="platform/packages/apps/CarrierConfig"/>
     <remove-project name="platform/packages/apps/CertInstaller"/>
@@ -244,15 +251,16 @@
     <remove-project name="platform/packages/apps/LegacyCamera"/>
     <remove-project name="platform/packages/apps/ManagedProvisioning"/>
     <remove-project name="platform/packages/apps/OneTimeInitializer"/>
-    <remove-project name="platform/packages/apps/PackageInstaller"/>
+    <!--<remove-project name="platform/packages/apps/PackageInstaller"/>-->
     <remove-project name="platform/packages/apps/Protips"/>
     <remove-project name="platform/packages/apps/Provision"/>
     <remove-project name="platform/packages/apps/QuickSearchBox"/>
     <remove-project name="platform/packages/apps/SafetyRegulatoryInfo"/>
+    <remove-project name="platform/packages/apps/SecureElement"/>
     <remove-project name="platform/packages/apps/SoundRecorder"/>
     <remove-project name="platform/packages/apps/SpareParts"/>
     <remove-project name="platform/packages/apps/StorageManager"/>
-    <remove-project name="android_packages_apps_Tag"/>
+    <!--<remove-project name="android_packages_apps_Tag"/>-->
     <remove-project name="platform/packages/apps/Terminal"/>
     <remove-project name="platform/packages/apps/Test/connectivity"/>
     <remove-project name="platform/packages/apps/TimeZoneData"/>
@@ -261,26 +269,27 @@
     <remove-project name="platform/packages/apps/TvSettings"/>
     <remove-project name="platform/packages/apps/TV"/>
     <remove-project name="platform/packages/apps/UnifiedEmail"/>
-    <remove-project name="platform/packages/apps/WallpaperPicker"/>
-    <remove-project name="platform/packages/experimental"/>
-    <remove-project name="platform/packages/inputmethods/OpenWnn"/>
+    <!--<remove-project name="platform/packages/apps/WallpaperPicker"/>-->
+    <!--<remove-project name="platform/packages/experimental"/>-->
+    <!--<remove-project name="platform/packages/inputmethods/OpenWnn"/>-->
     <remove-project name="platform/packages/providers/ApplicationsProvider"/>
     <remove-project name="platform/packages/providers/BlockedNumberProvider"/>
     <remove-project name="platform/packages/providers/BookmarkProvider"/>
     <remove-project name="platform/packages/providers/CalendarProvider"/>
     <remove-project name="platform/packages/providers/CallLogProvider"/>
     <remove-project name="platform/packages/providers/ContactsProvider"/>
-    <remove-project name="platform/packages/providers/MediaProvider"/>
+    <!--<remove-project name="platform/packages/providers/MediaProvider"/>-->
     <remove-project name="platform/packages/providers/PartnerBookmarksProvider"/>
     <remove-project name="platform/packages/providers/TelephonyProvider"/>
     <remove-project name="platform/packages/providers/TvProvider"/>
     <remove-project name="platform/packages/providers/UserDictionaryProvider"/>
     <remove-project name="platform/packages/screensavers/Basic"/>
     <remove-project name="platform/packages/screensavers/PhotoTable"/>
-    <remove-project name="platform/packages/screensavers/WebView"/>
+    <!--<remove-project name="platform/packages/screensavers/WebView"/>-->
     <remove-project name="platform/packages/apps/Car/Dialer"/>
     <remove-project name="platform/packages/apps/Car/Hvac"/>
     <remove-project name="platform/packages/apps/Car/LatinIME"/>
+    <remove-project name="platform/packages/apps/Car/Launcher"/>
     <remove-project name="platform/packages/apps/Car/LensPicker"/>
     <remove-project name="platform/packages/apps/Car/LocalMediaPlayer"/>
     <remove-project name="platform/packages/apps/Car/Media"/>
@@ -294,7 +303,7 @@
     <remove-project name="platform/packages/services/BuiltInPrintService"/>
     <remove-project name="platform/packages/services/Car"/>
     <remove-project name="platform/packages/services/Mms"/>
-    <remove-project name="platform/packages/services/NetworkRecommendation"/>
+    <!--<remove-project name="platform/packages/services/NetworkRecommendation"/>-->
     <remove-project name="platform/packages/wallpapers/LivePicker"/>
 
     <remove-project name="platform/pdk"/>
@@ -308,7 +317,7 @@
     <remove-project name="platform/prebuilts/checkstyle"/>
     <remove-project name="platform/prebuilts/clang/host/darwin-x86"/>
     <remove-project name="platform/prebuilts/devtools"/>
-    <remove-project name="platform/prebuilts/deqp"/>
+    <!--<remove-project name="platform/prebuilts/deqp"/>-->
     <remove-project name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9"/>
     <remove-project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9"/>
     <remove-project name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1"/>
@@ -320,7 +329,7 @@
     <remove-project name="platform/prebuilts/gdb/linux-x86"/>
     <remove-project name="platform/prebuilts/go/darwin-x86"/>
     <remove-project name="platform/prebuilts/gradle-plugin"/>
-    <remove-project name="platform/prebuilts/libs/libedit"/>
+    <!--<remove-project name="platform/prebuilts/libs/libedit"/>-->
     <remove-project name="platform/prebuilts/maven_repo/android"/>
     <remove-project name="platform/prebuilts/maven_repo/bumptech"/>
     <remove-project name="platform/prebuilts/python/darwin-x86/2.7.5"/>
@@ -331,9 +340,8 @@
     <remove-project name="platform/system/connectivity/wificond"/>
     <remove-project name="platform/system/connectivity/wifilogd"/>
     <remove-project name="platform/system/chre"/>
-    <remove-project name="platform/system/libufdt"/>
     <remove-project name="platform/system/nvram"/>
-    <remove-project name="platform/system/tpm"/>
+    <!--<remove-project name="platform/system/tpm"/>-->
 
     <!-- Remove platform/test/vts to avoid the test errors and more dependencies -->
     <remove-project name="platform/test/framework"/>
@@ -342,13 +350,13 @@
     <remove-project name="platform/test/vti/dashboard"/>
     <remove-project name="platform/test/vti/fuzz_test_serving"/>
     <remove-project name="platform/test/vti/test_serving"/>
-    <remove-project name="platform/test/vts"/>
+    <!--<remove-project name="platform/test/vts"/>-->
     <remove-project name="platform/test/vts-testcase/fuzz"/>
     <remove-project name="platform/test/vts-testcase/hal"/>
-    <remove-project name="platform/test/vts-testcase/hal-trace"/>
+    <!--<remove-project name="platform/test/vts-testcase/hal-trace"/>-->
     <remove-project name="platform/test/vts-testcase/kernel"/>
-    <remove-project name="platform/test/vts-testcase/performance"/>
-    <remove-project name="platform/test/vts-testcase/nbu"/>
+    <!--<remove-project name="platform/test/vts-testcase/performance"/>-->
+    <!--<remove-project name="platform/test/vts-testcase/nbu"/>-->
     <remove-project name="platform/test/vts-testcase/security"/>
     <remove-project name="platform/test/vts-testcase/vndk"/>
 
@@ -364,13 +372,13 @@
     <remove-project name="platform/tools/repohooks"/>
     <remove-project name="platform/tools/studio/cloud"/>
     <remove-project name="platform/tools/swt"/>
-    <remove-project name="platform/tools/test/connectivity"/>
+    <!--<remove-project name="platform/tools/test/connectivity"/>-->
     <remove-project name="platform/tools/tradefederation"/>
     <remove-project name="platform/tools/tradefederation/contrib"/>
 
 
     <!-- Remove from omni-aosp.xml (forked AOSP) -->
-    <remove-project name="android_development"/>
+    <!--<remove-project name="android_development"/>-->
 
     <remove-project name="android_external_aac"/>
 
@@ -378,6 +386,7 @@
     <remove-project name="android_frameworks_opt_net_wifi"/>
     <remove-project name="android_frameworks_opt_telephony"/>
 
+    <!--
     <remove-project name="android_hardware_invensense"/>
     <remove-project name="android_hardware_qcom_audio"/>
     <remove-project name="android_hardware_qcom_bt"/>
@@ -385,6 +394,7 @@
     <remove-project name="android_hardware_qcom_media"/>
     <remove-project name="android_hardware_qcom_msm8998"/>
     <remove-project name="android_hardware_qcom_power"/>
+    -->
     <remove-project name="android_hardware_qcom_wlan"/>
 
     <remove-project name="android_packages_apps_Bluetooth"/>
@@ -392,26 +402,29 @@
     <remove-project name="android_packages_apps_CellBroadcastReceiver"/>
     <remove-project name="android_packages_apps_Contacts"/>
     <remove-project name="android_packages_apps_Dialer"/>
-    <remove-project name="android_packages_apps_EmergencyInfo"/>
+    <remove-project name="android_packages_apps_DocumentsUI"/>
+    <!--<remove-project name="android_packages_apps_EmergencyInfo"/>-->
     <remove-project name="android_packages_apps_Launcher3"/>
     <remove-project name="android_packages_apps_Gallery2"/>
     <remove-project name="android_packages_apps_Messaging"/>
     <remove-project name="android_packages_apps_MusicFX"/>
     <remove-project name="android_packages_apps_Nfc"/>
-    <remove-project name="android_packages_apps_OmniBrain"/>
-    <remove-project name="android_packages_apps_OmniChromium"/>
+    <!--<remove-project name="android_packages_apps_OmniBrain"/>-->
     <remove-project name="android_packages_apps_OmniLib"/>
+    <remove-project name="android_packages_apps_OmniRemote"/>
     <remove-project name="android_packages_apps_PhoneCommon"/>
     <remove-project name="android_packages_apps_Settings"/>
-    <remove-project name="android_packages_apps_Stk"/>
+    <remove-project name="android_packages_apps_SettingsIntelligence"/>
+    <!--<remove-project name="android_packages_apps_Stk"/>-->
     <remove-project name="android_packages_inputmethods_LatinIME"/>
     <remove-project name="android_packages_providers_DownloadProvider"/>
     <remove-project name="android_packages_services_Telecomm"/>
     <remove-project name="android_packages_services_Telephony"/>
 
+    <remove-project name="android_system_bpf"/>
     <remove-project name="android_system_bt"/>
     <remove-project name="android_system_nfc"/>
-    <remove-project name="android_system_update_engine"/>
+    <!--<remove-project name="android_system_update_engine"/>-->
 
 
     <!-- Remove from omni-caf.xml (forked CAF) -->
@@ -423,18 +436,21 @@
 
     <!-- Remove from omni-default.xml (OmniROM Projects) -->
     <remove-project name="android_packages_apps_Matlog"/>
-    <remove-project name="android_packages_apps_MonthCalendarWidget"/>
-    <remove-project name="android_packages_apps_OmniRecord"/>
+    <!--<remove-project name="android_packages_apps_MonthCalendarWidget"/>-->
     <remove-project name="android_packages_apps_OmniChange"/>
-    <remove-project name="android_packages_apps_OmniClock"/>
+    <!--<remove-project name="android_packages_apps_OmniClock"/>-->
     <remove-project name="android_packages_apps_OmniGears"/>
     <remove-project name="android_packages_services_OmniJaws"/>
     <remove-project name="android_packages_apps_OmniStyle"/>
     <remove-project name="android_packages_apps_OmniSwitch"/>
     <remove-project name="android_packages_apps_OpenDelta"/>
+    <remove-project name="android_packages_apps_OmniChromium"/>
+    <!--<remove-project name="android_packages_apps_OmniRecord"/>-->
     <remove-project name="android_packages_apps_Phonograph"/>
     <remove-project name="android_vendor_interfaces"/>
 
+    <remove-project name="platform/tools/asuite"/>
+    <remove-project name="platform/hardware/google/pixel"/>
 
     <!-- LAST: Add/Replace repos and particular directories needed by TWRP -->
     <include name="twrp-extras.xml"/>

remove.xml

@@ -1,44 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-
-  <remove-project name="device/generic/uml" />
-
   <remove-project name="platform/art" />
   <remove-project name="platform/bionic" />
   <remove-project name="platform/build" />
   <remove-project name="platform/build/soong" />
 
-  <remove-project name="platform/development" />
+  <!--<remove-project name="platform/development" />-->
 
   <remove-project name="platform/developers/build" />
   <remove-project name="platform/developers/demos" />
   <remove-project name="platform/developers/samples/android" />
 
   <remove-project name="device/common" />
+  <remove-project name="device/amlogic/yukawa" />
+  <remove-project name="device/amlogic/yukawa-kernel" />
   <remove-project name="device/generic/arm64" />
   <remove-project name="device/generic/armv7-a-neon" />
   <remove-project name="device/generic/car" />
-  <remove-project name="device/generic/mips" />
-  <remove-project name="device/generic/mips64" />
+  <remove-project name="device/generic/common" />
+  <remove-project name="device/generic/goldfish" />
+  <remove-project name="device/generic/goldfish-opengl" />
   <remove-project name="device/generic/mini-emulator-arm64" />
   <remove-project name="device/generic/mini-emulator-armv7-a-neon" />
-  <remove-project name="device/generic/mini-emulator-mips" />
-  <remove-project name="device/generic/mini-emulator-mips64" />
   <remove-project name="device/generic/mini-emulator-x86" />
   <remove-project name="device/generic/mini-emulator-x86_64" />
+  <remove-project name="device/generic/opengl-transport" />
   <remove-project name="device/generic/qemu" />
+  <remove-project name="device/generic/trusty" />
+  <remove-project name="device/generic/uml" />
   <remove-project name="device/generic/x86" />
   <remove-project name="device/generic/x86_64" />
-  <remove-project name="device/google/accessory/arduino" />
-  <remove-project name="device/google/accessory/demokit" />
   <remove-project name="device/google/atv" />
+  <remove-project name="device/google/bonito" />
+  <remove-project name="device/google/bonito-kernel" />
+  <remove-project name="device/google/bonito-sepolicy" />
   <remove-project name="device/google/contexthub" />
+  <remove-project name="device/google/coral" />
+  <remove-project name="device/google/coral-kernel" />
+  <remove-project name="device/google/coral-sepolicy" />
   <remove-project name="device/google/crosshatch" />
   <remove-project name="device/google/crosshatch-kernel" />
   <remove-project name="device/google/crosshatch-sepolicy" />
   <remove-project name="device/google/cuttlefish" />
   <remove-project name="device/google/cuttlefish_kernel" />
   <remove-project name="device/google/cuttlefish_common" />
+  <remove-project name="device/google/cuttlefish_vmm" />
+  <remove-project name="device/google/fuchsia" />
   <remove-project name="device/google/marlin" />
   <remove-project name="device/google/marlin-kernel" />
   <remove-project name="device/google/muskie" />
@@ -51,6 +58,10 @@
   <remove-project name="device/linaro/bootloader/OpenPlatformPkg" />
   <remove-project name="device/linaro/hikey" />
   <remove-project name="device/linaro/hikey-kernel" />
+  <remove-project name="device/linaro/poplar" />
+  <remove-project name="device/linaro/poplar-kernel" />
+  <remove-project name="device/ti/beagle-x15" />
+  <remove-project name="device/ti/beagle-x15-kernel" />
   <remove-project name="device/sample" />
 
   <remove-project name="platform/external/aac" />
@@ -59,45 +70,28 @@
   <remove-project name="platform/external/f2fs-tools" />
   <remove-project name="platform/external/libnfnetlink" />
   <remove-project name="platform/external/libnetfilter_conntrack" />
-  <remove-project name="platform/external/nos/host/android" />
-  <remove-project name="platform/external/nos/host/generic" />
-  <remove-project name="platform/external/nos/test/system-test-harness" />
-  <remove-project name="platform/external/mksh" />
-  <remove-project name="platform/external/tinycompress" />
+  <!--<remove-project name="platform/external/mksh" /> -->
+  <!--<remove-project name="platform/external/tinycompress" /> -->
   <remove-project name="platform/external/selinux" />
-  <remove-project name="platform/external/skia" />
+  <!--<remove-project name="platform/external/skia" />-->
   <remove-project name="platform/external/toybox" />
 
   <remove-project name="platform/frameworks/av" />
   <remove-project name="platform/frameworks/base" />
   <remove-project name="platform/frameworks/native" />
+  <remove-project name="platform/frameworks/opt/chips" />
   <remove-project name="platform/frameworks/opt/telephony" />
   <remove-project name="platform/frameworks/opt/net/ims" />
   <remove-project name="platform/frameworks/opt/net/wifi" />
 
-  <remove-project name="platform/hardware/intel/audio_media" />
-  <remove-project name="platform/hardware/intel/bootstub" />
-  <remove-project name="platform/hardware/intel/common/bd_prov" />
-  <remove-project name="platform/hardware/intel/common/libmix" />
-  <remove-project name="platform/hardware/intel/common/libstagefrighthw" />
-  <remove-project name="platform/hardware/intel/common/libva" />
-  <remove-project name="platform/hardware/intel/common/libwsbm" />
-  <remove-project name="platform/hardware/intel/common/omx-components" />
-  <remove-project name="platform/hardware/intel/common/utils" />
-  <remove-project name="platform/hardware/intel/common/wrs_omxil_core" />
-  <remove-project name="platform/hardware/intel/img/hwcomposer" />
-  <remove-project name="platform/hardware/intel/img/psb_headers" />
-  <remove-project name="platform/hardware/intel/img/psb_video" />
-  <remove-project name="platform/hardware/intel/sensors" />
-
-  <remove-project name="platform/hardware/invensense" />
+  <!--<remove-project name="platform/hardware/invensense" /> -->
   <remove-project name="platform/hardware/interfaces" />
   <remove-project name="platform/hardware/libhardware" />
   <remove-project name="platform/hardware/libhardware_legacy" />
 
-  <remove-project name="platform/hardware/marvell/bt" />
   <remove-project name="platform/hardware/nxp/nfc" />
 
+  <remove-project name="platform/hardware/google/pixel-sepolicy" />
   <remove-project name="platform/hardware/qcom/audio" />
   <remove-project name="platform/hardware/qcom/camera" />
   <remove-project name="platform/hardware/qcom/data/ipacfg-mgr" />
@@ -119,50 +113,56 @@
   <remove-project name="platform/hardware/qcom/sdm845/media" />
   <remove-project name="platform/hardware/qcom/power" />
   <remove-project name="platform/hardware/qcom/wlan" />
+
   <remove-project name="platform/hardware/ril" />
 
   <remove-project name="kernel/tests" />
 
   <remove-project name="platform/packages/apps/Bluetooth" />
+  <remove-project name="platform/packages/apps/Browser2" />
   <remove-project name="platform/packages/apps/Calendar" />
   <remove-project name="platform/packages/apps/CellBroadcastReceiver" />
   <remove-project name="platform/packages/apps/Contacts" />
+  <remove-project name="platform/packages/apps/DocumentsUI" />
   <remove-project name="platform/packages/apps/DeskClock" />
   <remove-project name="platform/packages/apps/Dialer" />
-  <remove-project name="platform/packages/apps/EmergencyInfo" />
+  <!--<remove-project name="platform/packages/apps/EmergencyInfo" />-->
   <remove-project name="platform/packages/apps/Gallery" />
   <remove-project name="platform/packages/apps/Gallery2" />
-  <remove-project name="platform/packages/apps/Launcher2" />
   <remove-project name="platform/packages/apps/Launcher3" />
   <remove-project name="platform/packages/apps/Messaging" />
   <remove-project name="platform/packages/apps/Music" />
   <remove-project name="platform/packages/apps/MusicFX" />
   <remove-project name="platform/packages/apps/Nfc" />
+  <remove-project name="platform/packages/apps/PackageInstaller" />
   <remove-project name="platform/packages/apps/PhoneCommon" />
   <remove-project name="platform/packages/apps/Settings" />
   <remove-project name="platform/packages/apps/SettingsIntelligence" />
-  <remove-project name="platform/packages/apps/Stk" />
-  <remove-project name="platform/packages/apps/Tag" />
+  <!--<remove-project name="platform/packages/apps/Stk" /> -->
+  <!--<remove-project name="platform/packages/apps/Tag" /> -->
+  <remove-project name="platform/packages/apps/ThemePicker" />
+  <remove-project name="platform/packages/apps/WallpaperPicker" />
+  <remove-project name="platform/packages/apps/WallpaperPicker2" />
 
   <remove-project name="platform/packages/inputmethods/LatinIME" />
 
   <remove-project name="platform/packages/providers/DownloadProvider" />
+  <remove-project name="platform/packages/providers/MediaProvider" />
 
   <remove-project name="platform/packages/services/Telephony" />
   <remove-project name="platform/packages/services/Telecomm" />
 
-  <remove-project name="platform/prebuilts/build-tools" />
+  <!--<remove-project name="platform/prebuilts/build-tools" /> -->
 
+  <remove-project name="platform/system/bpf" />
   <remove-project name="platform/system/bt" />
   <remove-project name="platform/system/core" />
   <remove-project name="platform/system/extras" />
   <remove-project name="platform/system/libhidl" />
   <remove-project name="platform/system/media" />
   <remove-project name="platform/system/nfc" />
-  <remove-project name="platform/system/netd" />
   <remove-project name="platform/system/sepolicy" />
   <remove-project name="platform/system/vold" />
   <remove-project name="platform/system/hardware/interfaces" />
   <remove-project name="platform/system/update_engine" />
-  <remove-project name="platform/packages/apps/DocumentsUI" />
 </manifest>

twrp-extras.xml

@@ -4,21 +4,21 @@
             fetch="https://github.com/PitchBlackRecoveryProject"/>
 
     <remote name="TeamWin"
-            fetch="https://github.com/TeamWin"/>
+            fetch="https://github.com/TeamWin"
+            review="https://gerrit.twrp.me" />
 
-    <!-- TWRP lives in omnirom android-9.0 (not AOSP!) -->
+<!-- TWRP lives in TeamWin android-10.0 (not AOSP!) -->
     <remove-project name="platform/bootable/recovery"/>
-    <project path="bootable/recovery" name="android_bootable_recovery" remote="PitchBlackRecoveryProject" revision="android-9.0"/>
+    <project path="bootable/recovery" name="android_bootable_recovery" remote="PitchBlackRecoveryProject" revision="android-10.0"/>
     <project path="vendor/pb" name="vendor_pb" remote="PitchBlackRecoveryProject" revision="pb" />
 
-    <!-- External Packages -->
-    <project path="external/busybox" name="android_external_busybox" remote="PitchBlackRecoveryProject" revision="android-9.0" />
+<!-- Include external Magisk repo for repack binaries -->
     <project path="external/zip" name="android_external_zip" remote="PitchBlackRecoveryProject" revision="lineage-16.0" />
   
     <!-- Magiskboot -->
     <project path="external/magisk-prebuilt" name="external_magisk-prebuilt" remote="PitchBlackRecoveryProject" revision="master" />
 	
-    <!-- Include TeamWin android_system_update_engine to build a good update_engine_sideload -->
-    <project path="system/update_engine" name="android_system_update_engine" remote="TeamWin" revision="android-9.0" />
-
+<!-- Include TeamWin android_system_update_engine to build a good update_engine_sideload -->
+    <!--<project path="system/update_engine" name="android_system_update_engine" remote="TeamWin" revision="android-9.0" />-->
 </manifest>
+