From c04f0e7f28c0b0fadd984ca18dbb49f8539dc343 Mon Sep 17 00:00:00 2001
From: MD Raza <raza231198@gmail.com>
Date: Sun, 26 Sep 2021 23:00:10 +0530
Subject: [PATCH 1/7] manifest: cleanup

Signed-off-by: MD Raza <raza231198@gmail.com>
---
 GLOBAL-PREUPLOAD.cfg        |  17 ---
 README.md                   |  24 ++--
 default.xml                 |  33 +++--
 omni-aosp.xml               |  92 -------------
 omni-caf.xml                |  16 ---
 omni-default.xml            |  45 -------
 omni-extra.xml              |   7 -
 pbrp.xml => pbrp-extras.xml |  35 +++--
 remove-minimal.xml          | 261 +++++++++++++-----------------------
 remove.xml                  |  66 ++-------
 10 files changed, 164 insertions(+), 432 deletions(-)
 delete mode 100644 GLOBAL-PREUPLOAD.cfg
 delete mode 100644 omni-aosp.xml
 delete mode 100644 omni-caf.xml
 delete mode 100644 omni-default.xml
 delete mode 100644 omni-extra.xml
 rename pbrp.xml => pbrp-extras.xml (62%)

diff --git a/GLOBAL-PREUPLOAD.cfg b/GLOBAL-PREUPLOAD.cfg
deleted file mode 100644
index e27f1fe..0000000
--- a/GLOBAL-PREUPLOAD.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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
diff --git a/README.md b/README.md
index aa9f64f..a579412 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
   <a href="https://pitchblackrecovery.com/docs" target="_blank">
     <img alt="Documentation" src="https://img.shields.io/badge/documentation-yes-brightgreen.svg" />
   </a>
-  
+
   <a href="https://www.patreon.com/pitchblackrecovery">
     <img src="https://img.shields.io/badge/$-donate-orange.svg?maxAge=2592000&amp;style=flat">
   </a>
@@ -78,14 +78,20 @@
   - Password Recovery etc
 
 ## How To Build
+To get started with AOSP sources to build PitchBlack, you'll need to get familiar
+with [Git and Repo](https://source.android.com/source/using-repo.html).
 
-
-```bash
-# Initialize the latest stable branch
-$ repo init -u git://github.com/PitchBlackRecoveryProject/manifest_pb -b android-11.0
-
-# Sync the latest stable branch
-$ repo sync
+To initialize your local repository using the AOSP trees to build PitchBlack, use a command like this:
+```
+repo init -u git://github.com/PitchBlackRecoveryProject/manifest_pb -b android-11.0
+```
+To initialize a shallow clone, which will save even more space, use a command like this:
+```
+repo init --depth=1 -u git://github.com/PitchBlackRecoveryProject/manifest_pb -b android-11.0
+```
+Sync the latest stable branch
+```
+repo sync
 ```
 
 Follow our omni_device.mk sample
@@ -98,7 +104,7 @@ Follow our omni_device.mk sample
 $ cd <source-dir>
 $ . build/envsetup.sh
 $ lunch omni_<device>-eng
-$ mka recoveryimage
+$ mka pbrp
 ````
 
 ## Become Official Maintainer
diff --git a/default.xml b/default.xml
index 18601e4..b9c3344 100644
--- a/default.xml
+++ b/default.xml
@@ -7,7 +7,7 @@
   <default revision="refs/tags/android-11.0.0_r37"
            remote="aosp"
            sync-c="true"
-           sync-j="12" />
+           sync-j="4" />
 
   <project path="build/make" name="platform/build" groups="pdk" >
     <copyfile src="core/root.mk" dest="Makefile" />
@@ -57,10 +57,17 @@
   <project path="device/google/bonito" name="device/google/bonito" groups="device,bonito" />
   <project path="device/google/bonito-kernel" name="device/google/bonito-kernel" groups="device,bonito" clone-depth="1" />
   <project path="device/google/bonito-sepolicy" name="device/google/bonito-sepolicy" groups="device,bonito" />
+  <project path="device/google/bramble" name="device/google/bramble" groups="device,bramble" />
+  <project path="device/google/bramble-sepolicy" name="device/google/bramble-sepolicy" groups="device,bramble" />
   <project path="device/google/contexthub" name="device/google/contexthub" groups="device,pdk" />
   <project path="device/google/coral" name="device/google/coral" groups="device,coral,generic_fs" />
   <project path="device/google/coral-kernel" name="device/google/coral-kernel" groups="device,coral,generic_fs" clone-depth="1" />
   <project path="device/google/coral-sepolicy" name="device/google/coral-sepolicy" groups="device,coral,generic_fs" />
+  <project path="device/google/redbull" name="device/google/redbull" groups="device,redbull" />
+  <project path="device/google/redbull-kernel" name="device/google/redbull-kernel" groups="device,redbull" clone-depth="1" />
+  <project path="device/google/redbull-sepolicy" name="device/google/redbull-sepolicy" groups="device,redbull" />
+  <project path="device/google/redfin" name="device/google/redfin" groups="device,redfin" />
+  <project path="device/google/redfin-sepolicy" name="device/google/redfin-sepolicy" groups="device,redfin" />
   <project path="device/google/sunfish" name="device/google/sunfish" groups="device,sunfish" />
   <project path="device/google/sunfish-kernel" name="device/google/sunfish-kernel" groups="device,sunfish" clone-depth="1" />
   <project path="device/google/sunfish-sepolicy" name="device/google/sunfish-sepolicy" groups="device,sunfish" />
@@ -71,12 +78,8 @@
   <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/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/trout" name="device/google/trout" groups="device,trout,gull" />
   <project path="device/google/vrservices" name="device/google/vrservices" groups="pdk" />
-  <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/google_car" name="device/google_car" groups="pdk" />
   <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" />
@@ -330,7 +333,7 @@
   <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/OpenCL-CTS" name="platform/external/OpenCL-CTS" groups="pdk" />
+  <project path="external/OpenCL-CTS" name="platform/external/OpenCL-CTS" />
   <project path="external/OpenCSD" name="platform/external/OpenCSD" groups="pdk" />
   <project path="external/openssh" name="platform/external/openssh" groups="pdk" />
   <project path="external/oss-fuzz" name="platform/external/oss-fuzz" groups="pdk" />
@@ -514,7 +517,6 @@
   <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom_msm8960,pdk-qcom" />
   <project path="hardware/qcom/msm8994" name="platform/hardware/qcom/msm8994" groups="qcom_msm8994,pdk-qcom" />
   <project path="hardware/qcom/msm8996" name="platform/hardware/qcom/msm8996" groups="qcom_msm8996,pdk-qcom" />
-  <project path="hardware/qcom/msm8998" name="platform/hardware/qcom/msm8998" groups="qcom_msm8998,pdk-qcom" />
   <project path="hardware/qcom/msm8x09" name="platform/hardware/qcom/msm8x09" groups="qcom_msm8x09" />
   <project path="hardware/qcom/msm8x26" name="platform/hardware/qcom/msm8x26" groups="qcom_msm8x26,pdk-qcom" />
   <project path="hardware/qcom/msm8x27" name="platform/hardware/qcom/msm8x27" groups="qcom_msm8x27,pdk-qcom" />
@@ -534,6 +536,12 @@
     <linkfile src="os_pickup.mk" dest="hardware/qcom/sm7150/Android.mk" />
     <linkfile src="os_pickup.bp" dest="hardware/qcom/sm7150/Android.bp" />
   </project>
+  <project path="hardware/qcom/sm7250/display" name="platform/hardware/qcom/sm7250/display" groups="qcom_sm7250" />
+  <project path="hardware/qcom/sm7250/gps" name="platform/hardware/qcom/sm7250/gps" groups="qcom_sm7250" >
+    <linkfile src="os_pickup.mk" dest="hardware/qcom/sm7250/Android.mk" />
+    <linkfile src="os_pickup.bp" dest="hardware/qcom/sm7250/Android.bp" />
+  </project>
+  <project path="hardware/qcom/sm7250/media" name="platform/hardware/qcom/sm7250/media" groups="qcom_sm7250" />
   <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" />
@@ -551,6 +559,7 @@
   <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/configs" name="kernel/configs" groups="vts,pdk" />
   <project path="kernel/prebuilts/4.19/arm64" name="kernel/prebuilts/4.19/arm64" groups="pdk" clone-depth="1" />
   <project path="kernel/tests" name="kernel/tests" groups="vts,pdk" />
@@ -626,7 +635,7 @@
   <project path="packages/apps/TvSettings" name="platform/packages/apps/TvSettings" groups="pdk-fs" />
   <project path="packages/apps/TV" name="platform/packages/apps/TV" groups="pdk" />
   <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/apps/WallpaperPicker" name="platform/packages/apps/WallpaperPicker" groups="pdk-fs" />
   <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/LeanbackIME" name="platform/packages/inputmethods/LeanbackIME" groups="pdk-fs" />
@@ -682,10 +691,12 @@
   <project path="prebuilts/cmdline-tools" name="platform/prebuilts/cmdline-tools" 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" />
   <project path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" groups="pdk,darwin,mips" clone-depth="1" />
   <project path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" groups="pdk,darwin,x86" clone-depth="1" />
+  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,linux,arm" clone-depth="1" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" groups="pdk,linux,arm" clone-depth="1" />
   <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" groups="pdk,linux" clone-depth="1" />
   <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" groups="pdk-fs" clone-depth="1" />
@@ -820,6 +831,8 @@
   <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" />
+
+  <!-- FIRST: Remove unused/forked Projects for minimal manifest -->
+  <include name="remove.xml" />
+
 </manifest>
diff --git a/omni-aosp.xml b/omni-aosp.xml
deleted file mode 100644
index 336b4f5..0000000
--- a/omni-aosp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-
-  <remote  name="github"
-           fetch="https://github.com/" />
-
-  <remote  name="gitlab"
-           fetch="https://gitlab.com/omnirom" />
-
-  <remote  name="omnirom"
-           fetch="https://github.com/omnirom"
-           review="gerrit.omnirom.org" />
-
-  <project path="art" name="android_art" remote="omnirom" revision="android-11" groups="pdk" />
-  <project path="bionic" name="android_bionic" remote="omnirom" revision="android-11" groups="pdk" />
-
-  <!-- <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-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-11" />
-  <!--<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-11" />
-  <!--<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-11" />
-
-  <project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-11" />
-  <project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-11" />
-  <project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-11" />
-  <project path="frameworks/opt/chips" name="android_frameworks_opt_chips" remote="omnirom" revision="android-11" />
-  <project path="frameworks/opt/telephony" name="android_frameworks_opt_telephony" remote="omnirom" revision="android-11" />
-  <project path="frameworks/opt/net/wifi" name="android_frameworks_opt_net_wifi" remote="omnirom" revision="android-11" />
-  <project path="frameworks/opt/net/ims" name="android_frameworks_opt_net_ims" remote="omnirom" revision="android-11" />
-
-  <project path="hardware/interfaces" name="android_hardware_interfaces" remote="omnirom" revision="android-11" />
-  <!--<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-11" />
-  <!--<project path="hardware/libhardware_legacy" name="android_hardware_libhardware_legacy" remote="omnirom" revision="android-11" groups="pdk" /> -->
-
-  <!--<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-11" />
-
-  <project path="packages/apps/Bluetooth" name="android_packages_apps_Bluetooth" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/Contacts" name="android_packages_apps_Contacts" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/CellBroadcastReceiver" name="android_packages_apps_CellBroadcastReceiver" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/Dialer" name="android_packages_apps_Dialer" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/DocumentsUI" name="android_packages_apps_DocumentsUI" remote="omnirom" revision="android-11" />
-  <!--<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-11" />
-  <project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-11" />
-  <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-11" />
-  <project path="packages/apps/PermissionController" name="android_packages_apps_PackageInstaller" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/PhoneCommon" name="android_packages_apps_PhoneCommon" remote="omnirom" revision="android-11" />
-  <!--<project path="packages/apps/Provision" name="android_packages_apps_Provision" remote="omnirom" revision="android-10" />-->
-  <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/SettingsIntelligence" name="android_packages_apps_SettingsIntelligence" remote="omnirom" revision="android-11" />
-  <!--<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-11" />
-  <project path="packages/apps/Terminal" name="android_packages_apps_Terminal" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/WallpaperPicker2" name="android_packages_apps_WallpaperPicker2" remote="omnirom" revision="android-11" />
-
-  <project path="packages/inputmethods/LatinIME" name="android_packages_inputmethods_LatinIME" remote="omnirom" revision="android-11" />
-
-  <project path="packages/providers/DownloadProvider" name="android_packages_providers_DownloadProvider" remote="omnirom" revision="android-11" />
-  <!--<project path="packages/providers/MediaProvider" name="android_packages_providers_MediaProvider" remote="omnirom" revision="android-11" />-->
-
-  <project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-11" />
-  <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-11" />
-
-  <!--<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-11" />
-  <project path="system/extras" name="android_system_extras" remote="omnirom" revision="android-11" />
-  <project path="system/media" name="android_system_media" remote="omnirom" revision="android-11" />
-  <project path="system/nfc" name="android_system_nfc" remote="omnirom" revision="android-11" />
-  <project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-11" />
-  <project path="system/vold" name="android_system_vold" remote="omnirom" revision="android-11" />
-  <!--<project path="system/hardware/interfaces" name="android_system_hardware_interfaces" remote="omnirom" revision="android-11" />-->
-
-  <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" revision="a9b70fc1b59747d1334677e539b2ef4c752a59a1" />
-  <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" revision="639243dd5cb2c5ea1313f033c75c8c533813a484"/>
-</manifest>
diff --git a/omni-caf.xml b/omni-caf.xml
deleted file mode 100644
index 934ba41..0000000
--- a/omni-caf.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-
-  <remote  name="github"
-           fetch="https://github.com/" />
-
-  <remote  name="omnirom"
-           fetch="https://github.com/omnirom"
-           review="gerrit.omnirom.org" />
-
-  <!--<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-11" />
-  <project path="vendor/qcom/opensource/interfaces" name="android_vendor_qcom_opensource_interfaces" remote="omnirom" revision="android-11" />
-  <project path="vendor/qcom/opensource/display-commonsys-intf" name="android_vendor_qcom_opensource_display-commonsys-intf" remote="omnirom" revision="android-11" />
-  <project path="vendor/qcom/opensource/commonsys" name="android_vendor_qcom_opensource_commonsys" remote="omnirom" revision="android-11" />
-</manifest>
diff --git a/omni-default.xml b/omni-default.xml
deleted file mode 100644
index 8f9adbd..0000000
--- a/omni-default.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <!-- FIRST: Remove unused/forked AOSP Projects -->
-  <include name="remove.xml" />
-
-  <!-- Include forked AOSP -->
-  <include name="omni-aosp.xml" />
-
-  <!-- Include forked CAF -->
-  <include name="omni-caf.xml" />
-
-  <!-- include registered repos -->
-  <include name="omni-extra.xml" />
-
-  <!-- PBRP -->
-  <include name="pbrp.xml" />
-
-  <!-- OmniROM Projects -->
-  <project path="android" name="android" remote="omnirom" revision="android-11" />
-
-  <!-- project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-11" />-->
-  <project path="vendor/interfaces" name="android_vendor_interfaces" remote="omnirom" revision="android-11" />
-
-  <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-11" />
-  <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-11" />
-  <project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/OmniChromium" name="android_packages_apps_OmniChromium" remote="gitlab" revision="android-11" />
-  <project path="packages/apps/WallpaperCropper2" name="android_packages_apps_WallpaperCropper2" remote="omnirom" revision="android-11" />
-
-  <!-- LAST: Remove unused/forked Projects for minimal PBRP -->
-  <include name="remove-minimal.xml" />
-</manifest>
diff --git a/omni-extra.xml b/omni-extra.xml
deleted file mode 100644
index 19006c7..0000000
--- a/omni-extra.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/Calendar" name="android_packages_apps_Calendar" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/ExactCalculator" name="android_packages_apps_ExactCalculator" remote="omnirom" revision="android-11" />
-  <project path="packages/apps/Phonograph" name="android_packages_apps_Phonograph" remote="omnirom" revision="android-11" />
-</manifest>
diff --git a/pbrp.xml b/pbrp-extras.xml
similarity index 62%
rename from pbrp.xml
rename to pbrp-extras.xml
index 955c8da..18b122b 100644
--- a/pbrp.xml
+++ b/pbrp-extras.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
     <remote name="PitchBlackRecoveryProject"
-            fetch="https://github.com/PitchBlackRecoveryProject"/>
+            fetch="https://github.com/PitchBlackRecoveryProject" />
 
     <remote name="TeamWin"
             fetch="https://github.com/TeamWin"
@@ -9,8 +9,13 @@
 
     <remote name="LineageOS"
             fetch="https://github.com/LineageOS"
-            review="https://review.lineageos.org"
-            revision="lineage-18.1" />
+            review="https://review.lineageos.org" />
+
+    <remote name="github"
+            fetch="https://github.com" />
+
+    <!-- PitchBlack lives in PitchBlackRecoveryProject android-11 (not AOSP!) -->
+    <project path="bootable/recovery" name="android_bootable_recovery" remote="PitchBlackRecoveryProject" revision="android-11.0" />
 
     <project path="build/make" name="android_build" remote="PitchBlackRecoveryProject" revision="android-11.0" groups="pdk" >
       <copyfile src="core/root.mk" dest="Makefile" />
@@ -21,25 +26,37 @@
       <linkfile src="target" dest="build/target" />
       <linkfile src="tools" dest="build/tools" />
     </project>
+
     <project path="build/soong" name="android_build_soong" remote="PitchBlackRecoveryProject" revision="android-11.0" >
         <linkfile src="root.bp" dest="Android.bp" />
         <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
     </project>
 
-    <!-- External -->
     <project path="external/bouncycastle" name="external_bouncycastle" remote="PitchBlackRecoveryProject" revision="android-11.0" />
+
+    <!-- Include external Magisk repo for repack binaries -->
     <project path="external/magisk-prebuilt" name="external_magisk-prebuilt" remote="PitchBlackRecoveryProject" revision="android-11.0" />
 
-    <!-- General -->
-    <project path="bootable/recovery" name="android_bootable_recovery" remote="PitchBlackRecoveryProject" revision="android-11.0"/>
+    <!-- Include ntfs_3g for NTFS support -->
+    <project path="external/ntfs-3g" name="android_external_ntfs-3g" remote="LineageOS" revision="lineage-18.1" />
+
+    <project path="hardware/interfaces" name="android_hardware_interfaces" remote="TeamWin" revision="android-11" />
 
     <!-- System -->
     <project path="system/core" name="system_core" remote="PitchBlackRecoveryProject" revision="android-11.0" />
     <project path="system/libhidl" name="android_system_libhidl" remote="PitchBlackRecoveryProject" revision="android-11.0" />
-    <project path="prebuilts/tools-lineage" name="android_prebuilts_tools-lineage" remote="LineageOS" />
+    <project path="system/update_engine" name="android_system_update_engine" remote="TeamWin" revision="android-11" />
+
+    <!-- Include lineage-tools for lzma support -->
+    <project path="prebuilts/tools-lineage" name="android_prebuilts_tools-lineage" remote="LineageOS" revision="lineage-18.1" />
 
-    <!-- Vendor -->
-    <project path="vendor/pb" name="vendor_pb" remote="PitchBlackRecoveryProject" revision="pb-11.0" />
+    <!-- Use PitchBlack repos for full recovery compatibility -->
+    <project path="vendor/pb" name="vendor_pb" remote="PitchBlackRecoveryProject" revision="pb-11.0" >
+       <copyfile src="dummy/Android.mk" dest="frameworks/base/core/xsd/vts/Android.mk" />
+       <copyfile src="dummy/Android.mk" dest="frameworks/base/services/core/xsd/vts/Android.mk" />
+       <copyfile src="dummy/Android.mk" dest="system/libvintf/xsd/compatibilityMatrix/vts/Android.mk" />
+       <copyfile src="dummy/Android.mk" dest="system/libvintf/xsd/halManifest/vts/Android.mk" />
+    </project>
     <project path="vendor/utils" name="vendor_utils" remote="PitchBlackRecoveryProject" revision="pb" >
         <linkfile src="pb_build.sh" dest="vendor/pb/pb_build.sh" />
     </project>
diff --git a/remove-minimal.xml b/remove-minimal.xml
index 9d0ca32..a035126 100644
--- a/remove-minimal.xml
+++ b/remove-minimal.xml
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
+    <remove-project name="device/generic/art" />
+    <remove-project name="device/google/bramble" />
+    <remove-project name="device/google/bramble-sepolicy" />
+    <remove-project name="device/google/redbull-sepolicy" />
+    <remove-project name="device/google/redfin" />
+    <remove-project name="device/google/redfin-sepolicy" />
+    <remove-project name="device/google/sunfish" />
+    <remove-project name="device/google/sunfish-kernel" />
+    <remove-project name="device/google/sunfish-sepolicy" />
+    <remove-project name="device/google/cuttlefish" />
+    <remove-project name="device/google/cuttlefish_kernel" />
+    <remove-project name="device/google/cuttlefish_vmm" />
+    <remove-project name="device/google/trout" />
+    <remove-project name="device/google_car" />
+    <remove-project name="device/linaro/dragonboard" />
+    <remove-project name="device/linaro/dragonboard-kernel" />
+    <remove-project name="device/mediatek/wembley-sepolicy" />
 
-    <!-- Remove from default.xml -->
-    <!--
-    <remove-project name="device/generic/common"/>
-    <remove-project name="device/generic/goldfish"/>
-    <remove-project name="device/generic/goldfish-opengl"/>
-    -->
+    <remove-project name="platform/cts" />
 
-    <!--<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"/>
@@ -24,50 +29,37 @@
     <remove-project name="platform/external/apache-harmony"/>
     <remove-project name="platform/external/apache-http"/>
     <remove-project name="platform/external/apache-xml"/>
-    <!--<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/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/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/dexmaker"/>
-    <!--<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"/>
     <remove-project name="platform/external/drm_hwcomposer"/>
-    
-	<!--<remove-project name="platform/external/droiddriver"/>-->
     <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/fdlibm"/>
-    <!--<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-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/guava"/>
     <remove-project name="platform/external/guice"/>
     <remove-project name="platform/external/hamcrest"/>
@@ -83,14 +75,11 @@
     <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/jcommander"/>
     <remove-project name="platform/external/jdiff"/>
     <remove-project name="platform/external/jline"/>
-    <!--<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/jsr305"/>
     <remove-project name="platform/external/jsr330"/>
     <remove-project name="platform/external/junit"/>
@@ -100,40 +89,30 @@
     <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/libcups"/>
     <remove-project name="platform/external/libdaemon"/>
     <remove-project name="platform/external/libdivsufsort"/>
-    <!--<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/libmpeg2"/>
-    <!--<remove-project name="platform/external/libmtp"/>-->
     <remove-project name="platform/external/libogg"/>
     <remove-project name="platform/external/libopus"/>
     <remove-project name="platform/external/libpcap"/>
     <remove-project name="platform/external/libphonenumber"/>
     <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/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/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/mockftpserver"/>
     <remove-project name="platform/external/mockito"/>
     <remove-project name="platform/external/mockwebserver"/>
@@ -142,15 +121,14 @@
     <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/neven"/>
     <remove-project name="platform/external/nfacct"/>
     <remove-project name="platform/external/nist-pkits"/>
     <remove-project name="platform/external/nist-sip"/>
-    <remove-project name="platform/external/noto-fonts"/>
     <remove-project name="platform/external/oauth"/>
     <remove-project name="platform/external/objenesis"/>
     <remove-project name="platform/external/okhttp"/>
+    <remove-project name="platform/external/OpenCL-CTS" />
     <remove-project name="platform/external/owasp/sanitizer"/>
     <remove-project name="platform/external/parameter-framework"/>
     <remove-project name="platform/external/pdfium"/>
@@ -161,32 +139,24 @@
     <remove-project name="platform/external/python/cpython3"/>
     <remove-project name="platform/external/replicaisland"/>
     <remove-project name="platform/external/rmi4utils"/>
-    <!--<remove-project name="platform/external/robolectric"/>-->
-    <remove-project name="platform/external/roboto-fonts"/>
     <remove-project name="platform/external/rootdev"/>
     <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="platform/external/skqp" />
     <remove-project name="platform/external/sl4a"/>
     <remove-project name="platform/external/slf4j"/>
     <remove-project name="platform/external/smali"/>
     <remove-project name="platform/external/snakeyaml"/>
     <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/stressapptest"/>
     <remove-project name="platform/external/swiftshader"/>
-    <!--<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/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/tremolo"/>
     <remove-project name="platform/external/unicode"/>
     <remove-project name="platform/external/universal-tween-engine"/>
@@ -199,112 +169,121 @@
     <remove-project name="platform/external/walt"/>
     <remove-project name="platform/external/webp"/>
     <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/xmp_toolkit"/>
-    <remove-project name="platform/external/zopfli"/>
     <remove-project name="platform/external/zxing"/>
 
+    <remove-project name="platform/frameworks/av" />
     <remove-project name="platform/frameworks/compile/mclinker"/>
     <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/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/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/net/ethernet"/>
-    <!--<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/wilhelm"/>
 
-    <!--<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"/>
     <remove-project name="platform/hardware/google/apf"/>
     <remove-project name="platform/hardware/google/easel"/>
     <remove-project name="platform/hardware/google/interfaces"/>
-    <remove-project name="android_vendor_qcom_opensource_interfaces"/>
+    <remove-project name="platform/hardware/google/pixel"/>
+    <remove-project name="platform/hardware/interfaces"/>
     <remove-project name="platform/hardware/qcom/keymaster"/>
 
     <remove-project name="platform/packages/apps/BasicSmsReceiver"/>
     <remove-project name="platform/packages/apps/Camera2"/>
+    <remove-project name="platform/packages/apps/Car/Calendar"/>
+    <remove-project name="platform/packages/apps/Car/Cluster"/>
+    <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/LinkViewer"/>
+    <remove-project name="platform/packages/apps/Car/LocalMediaPlayer"/>
+    <remove-project name="platform/packages/apps/Car/Media"/>
+    <remove-project name="platform/packages/apps/Car/Messenger"/>
+    <remove-project name="platform/packages/apps/Car/Notification"/>
+    <remove-project name="platform/packages/apps/Car/Radio"/>
+    <remove-project name="platform/packages/apps/Car/RotaryController"/>
+    <remove-project name="platform/packages/apps/Car/Settings"/>
+    <remove-project name="platform/packages/apps/Car/SystemUpdater"/>
+    <remove-project name="platform/packages/apps/Car/libs"/>
+    <remove-project name="platform/packages/apps/Car/tests"/>
     <remove-project name="platform/packages/apps/CarrierConfig"/>
+    <remove-project name="platform/packages/apps/CellBroadcastReceiver"/>
     <remove-project name="platform/packages/apps/CertInstaller"/>
     <remove-project name="platform/packages/apps/DevCamera"/>
-    <!--<remove-project name="platform/packages/apps/Email"/>-->
-    <!--<remove-project name="platform/packages/apps/ExactCalculator"/>-->
+    <remove-project name="platform/packages/apps/EmergencyInfo"/>
     <remove-project name="platform/packages/apps/HTMLViewer"/>
     <remove-project name="platform/packages/apps/KeyChain"/>
     <remove-project name="platform/packages/apps/LegacyCamera"/>
     <remove-project name="platform/packages/apps/ManagedProvisioning"/>
+    <remove-project name="platform/packages/apps/OnDeviceAppPrediction"/>
     <remove-project name="platform/packages/apps/OneTimeInitializer"/>
-    <!--<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/QuickAccessWallet"/>
     <remove-project name="platform/packages/apps/QuickSearchBox"/>
     <remove-project name="platform/packages/apps/SafetyRegulatoryInfo"/>
+    <remove-project name="platform/packages/apps/SampleLocationAttribution"/>
     <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/Stk"/>
     <remove-project name="platform/packages/apps/StorageManager"/>
-    <!--<remove-project name="android_packages_apps_Tag"/>-->
-    <!--<remove-project name="platform/packages/apps/Terminal"/>-->
+    <remove-project name="platform/packages/apps/Tag"/>
     <remove-project name="platform/packages/apps/Test/connectivity"/>
     <remove-project name="platform/packages/apps/TimeZoneData"/>
     <remove-project name="platform/packages/apps/TimeZoneUpdater"/>
     <remove-project name="platform/packages/apps/Traceur"/>
     <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/providers/ApplicationsProvider"/>-->
+    <remove-project name="platform/packages/apps/UniversalMediaPlayer"/>
+
+    <remove-project name="platform/packages/inputmethods/LeanbackIME" />
+
+    <remove-project name="platform/packages/modules/ArtPrebuilt" />
+    <remove-project name="platform/packages/modules/CaptivePortalLogin" />
+    <remove-project name="platform/packages/modules/CellBroadcastService" />
+    <remove-project name="platform/packages/modules/Cronet" />
+    <remove-project name="platform/packages/modules/ExtServices" />
+    <remove-project name="platform/packages/modules/IPsec" />
+    <remove-project name="platform/packages/modules/ModuleMetadata" />
+    <remove-project name="platform/packages/modules/NetworkPermissionConfig" />
+    <remove-project name="platform/packages/modules/NetworkStack" />
+    <remove-project name="platform/packages/modules/SdkExtensions" />
+    <remove-project name="platform/packages/modules/TestModule"/>
+    <remove-project name="platform/packages/modules/vndk" />
+
     <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/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/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"/>
-    <remove-project name="platform/packages/apps/Car/Messenger"/>
-    <!--<remove-project name="platform/packages/apps/Car/Overview"/>-->
-    <remove-project name="platform/packages/apps/Car/Radio"/>
-    <remove-project name="platform/packages/apps/Car/Settings"/>
-    <!--<remove-project name="platform/packages/apps/Car/Stream"/>-->
-    <remove-project name="platform/packages/apps/Car/SystemUpdater"/>
-    <remove-project name="platform/packages/apps/Car/libs"/>
+
+    <remove-project name="platform/packages/services/AlternativeNetworkAccess"/>
     <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/Mtp"/>
+
+    <remove-project name="platform/packages/wallpapers/ImageWallpaper"/>
     <remove-project name="platform/packages/wallpapers/LivePicker"/>
 
     <remove-project name="platform/pdk"/>
@@ -318,19 +297,16 @@
     <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/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9"/>-->
+    <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"/>
     <remove-project name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9"/>
     <remove-project name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9"/>
-    <remove-project name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8"/>
     <remove-project name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9"/>
     <remove-project name="platform/prebuilts/gdb/darwin-x86"/>
     <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/maven_repo/android"/>
     <remove-project name="platform/prebuilts/maven_repo/bumptech"/>
     <remove-project name="platform/prebuilts/python/darwin-x86/2.7.5"/>
@@ -342,96 +318,41 @@
     <remove-project name="platform/system/connectivity/wifilogd"/>
     <remove-project name="platform/system/chre"/>
     <remove-project name="platform/system/nvram"/>
-    <!--<remove-project name="platform/system/tpm"/>-->
+
+    <!-- Remove platform/test/vts to avoid the test errors and more dependencies -->
+    <remove-project name="platform/test/app_compat/csuite" />
+    <remove-project name="platform/test/framework"/>
+    <remove-project name="platform/test/mlts/benchmark" />
+    <remove-project name="platform/test/mlts/models" />
+    <remove-project name="platform/test/mts" />
+    <remove-project name="platform/test/suite_harness"/>
+    <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-testcase/fuzz"/>
+    <remove-project name="platform/test/vts-testcase/hal"/>
+    <remove-project name="platform/test/vts-testcase/kernel"/>
+    <remove-project name="platform/test/vts-testcase/security"/>
+    <remove-project name="platform/test/vts-testcase/vndk"/>
 
     <remove-project name="platform/tools/adt/idea"/>
     <remove-project name="platform/tools/apksig"/>
     <remove-project name="platform/tools/base"/>
     <remove-project name="platform/tools/build"/>
     <remove-project name="platform/tools/external/fat32lib"/>
-    <!--<remove-project name="platform/tools/external/gradle"/>-->
     <remove-project name="platform/tools/idea"/>
     <remove-project name="platform/tools/loganalysis"/>
     <remove-project name="platform/tools/motodev"/>
     <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/tradefederation"/>
     <remove-project name="platform/tools/tradefederation/contrib"/>
 
-
-    <!-- Remove from omni-aosp.xml (forked AOSP) -->
-    <!--<remove-project name="android_development"/>-->
-
-    <!--<remove-project name="android_external_aac"/>-->
-
-    <remove-project name="android_frameworks_opt_net_ims"/>
-    <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"/>
-    <remove-project name="android_hardware_qcom_display"/>
-    <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"/>
-    <remove-project name="android_packages_apps_Calendar"/>
-    <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_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_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_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 from omni-caf.xml (forked CAF) -->
-    <!--<remove-project name="android_external_libnetfilter_conntrack"/>-->
-    <!--<remove-project name="android_external_libnfnetlink"/>-->
-    <!--<remove-project name="android_hardware_ril"/>-->
-    <remove-project name="android_vendor_codeaurora_telephony"/>
-
-
-    <!-- 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_OmniChange"/>-->
-    <!--<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 PitchBlack -->
+    <include name="pbrp-extras.xml"/>
 
 </manifest>
diff --git a/remove.xml b/remove.xml
index a1ad69b..680df35 100644
--- a/remove.xml
+++ b/remove.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remove-project name="platform/art" />
-  <remove-project name="platform/bionic" />
+  <remove-project name="platform/bootable/recovery"/>
+
   <remove-project name="platform/build" />
   <remove-project name="platform/build/soong" />
 
-  <!--<remove-project name="platform/development" />-->
-
   <remove-project name="platform/developers/build" />
   <remove-project name="platform/developers/demos" />
   <remove-project name="platform/developers/samples/android" />
@@ -42,11 +40,8 @@
   <remove-project name="device/google/crosshatch-kernel" />
   <remove-project name="device/google/crosshatch-sepolicy" />
   <remove-project name="device/google/fuchsia" />
-  <remove-project name="device/google/muskie" />
-  <remove-project name="device/google/sunfish" />
-  <remove-project name="device/google/taimen" />
-  <remove-project name="device/google/wahoo" />
-  <remove-project name="device/google/wahoo-kernel" />
+  <remove-project name="device/google/redbull" />
+  <remove-project name="device/google/redbull-kernel" />
   <remove-project name="device/google/vrservices" />
   <remove-project name="device/linaro/bootloader/arm-trusted-firmware" />
   <remove-project name="device/linaro/bootloader/edk2" />
@@ -59,33 +54,7 @@
   <remove-project name="device/ti/beagle-x15-kernel" />
   <remove-project name="device/sample" />
 
-  <remove-project name="platform/bootable/recovery"/>
-
-  <!--<remove-project name="platform/external/aac" /> -->
-  <remove-project name="platform/external/bouncycastle" />
-  <!--<remove-project name="platform/external/e2fsprogs" />-->
-  <remove-project name="platform/external/chromium-webview" />
-  <remove-project name="platform/external/f2fs-tools" />
-  <!--<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/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/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/nxp/nfc" />-->
+  <remove-project name="platform/external/bouncycastle"/>
 
   <remove-project name="platform/hardware/google/pixel-sepolicy" />
   <remove-project name="platform/hardware/qcom/audio" />
@@ -98,7 +67,6 @@
   <remove-project name="platform/hardware/qcom/msm8960" />
   <remove-project name="platform/hardware/qcom/msm8994" />
   <remove-project name="platform/hardware/qcom/msm8996" />
-  <remove-project name="platform/hardware/qcom/msm8998" />
   <remove-project name="platform/hardware/qcom/msm8x09" />
   <remove-project name="platform/hardware/qcom/msm8x26" />
   <remove-project name="platform/hardware/qcom/msm8x27" />
@@ -108,21 +76,16 @@
   <remove-project name="platform/hardware/qcom/sdm845/gps" />
   <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/Gallery" />
   <remove-project name="platform/packages/apps/Gallery2" />
   <remove-project name="platform/packages/apps/Launcher3" />
@@ -132,11 +95,8 @@
   <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/Provision" />-->
   <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/Terminal" />
   <remove-project name="platform/packages/apps/ThemePicker" />
   <remove-project name="platform/packages/apps/WallpaperPicker" />
@@ -145,23 +105,15 @@
   <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/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/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/sepolicy" />
-  <remove-project name="platform/system/vold" />
-  <!--<remove-project name="platform/system/hardware/interfaces" />-->
-
-  <remove-project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" />
+  <remove-project name="platform/system/update_engine" />
 
+  <!-- LAST: Remove unused/forked Projects for minimal TWRP -->
+  <include name="remove-minimal.xml"/>
 </manifest>

From 8d7be9252068e62b8a6a46b4beafe61f5c64d66b Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sat, 23 Oct 2021 14:11:22 -0400
Subject: [PATCH 2/7] Use TeamWin repo for system_sepolicy

Change-Id: Ibd3865ca93988497dda851b0b280aa4826776a7f
---
 pbrp-extras.xml    | 3 +++
 remove-minimal.xml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pbrp-extras.xml b/pbrp-extras.xml
index 18b122b..4665d80 100644
--- a/pbrp-extras.xml
+++ b/pbrp-extras.xml
@@ -37,6 +37,9 @@
     <!-- Include external Magisk repo for repack binaries -->
     <project path="external/magisk-prebuilt" name="external_magisk-prebuilt" remote="PitchBlackRecoveryProject" revision="android-11.0" />
 
+    <!-- Include external Magisk repo for repack binaries -->
+    <project path="system/sepolicy" name="android_system_sepolicy" remote="TeamWin" revision="android-11"/>
+
     <!-- Include ntfs_3g for NTFS support -->
     <project path="external/ntfs-3g" name="android_external_ntfs-3g" remote="LineageOS" revision="lineage-18.1" />
 
diff --git a/remove-minimal.xml b/remove-minimal.xml
index a035126..1365ea7 100644
--- a/remove-minimal.xml
+++ b/remove-minimal.xml
@@ -318,6 +318,7 @@
     <remove-project name="platform/system/connectivity/wifilogd"/>
     <remove-project name="platform/system/chre"/>
     <remove-project name="platform/system/nvram"/>
+    <remove-project name="platform/system/sepolicy"/>
 
     <!-- Remove platform/test/vts to avoid the test errors and more dependencies -->
     <remove-project name="platform/test/app_compat/csuite" />

From 0dee273b11b044d345600f3d9f258b2809d057d0 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sat, 23 Oct 2021 14:26:03 -0400
Subject: [PATCH 3/7] Fix comment on system_sepolicy repo

---
 pbrp-extras.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pbrp-extras.xml b/pbrp-extras.xml
index 4665d80..c7949da 100644
--- a/pbrp-extras.xml
+++ b/pbrp-extras.xml
@@ -37,7 +37,7 @@
     <!-- Include external Magisk repo for repack binaries -->
     <project path="external/magisk-prebuilt" name="external_magisk-prebuilt" remote="PitchBlackRecoveryProject" revision="android-11.0" />
 
-    <!-- Include external Magisk repo for repack binaries -->
+    <!-- Include TeamWin sepolicy repo for postinstall support -->
     <project path="system/sepolicy" name="android_system_sepolicy" remote="TeamWin" revision="android-11"/>
 
     <!-- Include ntfs_3g for NTFS support -->

From 95439e2cc787a9d36d5f0c80387e0a6900d8118b Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 19 Nov 2021 10:22:27 -0500
Subject: [PATCH 4/7] Add @phhusson's lptools repo for lptools support

Change-Id: I6bf0d0bf0f48f902a2e17afdd777797f6ad14479
---
 pbrp-extras.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pbrp-extras.xml b/pbrp-extras.xml
index c7949da..d18049f 100644
--- a/pbrp-extras.xml
+++ b/pbrp-extras.xml
@@ -40,6 +40,9 @@
     <!-- Include TeamWin sepolicy repo for postinstall support -->
     <project path="system/sepolicy" name="android_system_sepolicy" remote="TeamWin" revision="android-11"/>
 
+    <!-- Include phh's treble repo for lptools support -->
+    <project name="phhusson/vendor_lptools" path="external/lptools" remote="github" revision="master" />
+
     <!-- Include ntfs_3g for NTFS support -->
     <project path="external/ntfs-3g" name="android_external_ntfs-3g" remote="LineageOS" revision="lineage-18.1" />
 

From 3ad256532d3fc9f0fe4ae6449ae74deb92dc2c5e Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 24 Dec 2021 10:42:23 -0500
Subject: [PATCH 5/7] twrp-extras: add qcom common repos

Change-Id: I4bbb6e7584920267d12180f3aab11249a04057e8
---
 pbrp-extras.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pbrp-extras.xml b/pbrp-extras.xml
index d18049f..5f98fc5 100644
--- a/pbrp-extras.xml
+++ b/pbrp-extras.xml
@@ -67,4 +67,12 @@
         <linkfile src="pb_build.sh" dest="vendor/pb/pb_build.sh" />
     </project>
 
+    <!-- Common Qualcomm Repos -->
+    <project name="android_device_qcom_common" path="device/qcom/common" remote="TeamWin" revision="android-11" />
+    <project name="android_device_qcom_twrp-common" path="device/qcom/twrp-common" remote="TeamWin" revision="android-11" />
+    <project name="android_hardware_qcom_bootctrl" path="hardware/qcom-caf/bootctrl" remote="LineageOS" revision="lineage-18.1-caf" />
+    <project name="android_vendor_qcom_opensource_display-commonsys-intf" path="vendor/qcom/opensource/commonsys-intf/display" remote="LineageOS" revision="lineage-18.1" />
+    <project name="android_vendor_qcom_opensource_cryptfs_hw" path="vendor/qcom/opensource/cryptfs_hw" remote="LineageOS" revision="lineage-18.1" />
+    <project name="android_vendor_qcom_opensource_interfaces" path="vendor/qcom/opensource/interfaces" remote="LineageOS" revision="lineage-18.1" />
+    <project name="android_vendor_qcom_opensource_vibrator" path="vendor/qcom/opensource/vibrator" remote="LineageOS" revision="lineage-18.1" />
 </manifest>

From ff11880361cbf3887cfd627a51eb6e082d2274cc Mon Sep 17 00:00:00 2001
From: Antonino Scordino <git@antonino.cf>
Date: Sat, 26 Mar 2022 16:30:29 +0100
Subject: [PATCH 6/7] README: Replace `git://` with `https://`

- git:// has been deprecated by GitHub:
   *  fatal: remote error:
      The unauthenticated git protocol on port 9418 is no longer supported.
      Please see https://github.blog/2021-09-01-improving-git-protocol-security-github/ for more information.
      manifests: sleeping 4.0 seconds before retrying

- Switch to https://, since people may get confused while copy-pasting commands.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a579412..20c7194 100644
--- a/README.md
+++ b/README.md
@@ -83,11 +83,11 @@ with [Git and Repo](https://source.android.com/source/using-repo.html).
 
 To initialize your local repository using the AOSP trees to build PitchBlack, use a command like this:
 ```
-repo init -u git://github.com/PitchBlackRecoveryProject/manifest_pb -b android-11.0
+repo init -u https://github.com/PitchBlackRecoveryProject/manifest_pb -b android-11.0
 ```
 To initialize a shallow clone, which will save even more space, use a command like this:
 ```
-repo init --depth=1 -u git://github.com/PitchBlackRecoveryProject/manifest_pb -b android-11.0
+repo init --depth=1 -u https://github.com/PitchBlackRecoveryProject/manifest_pb -b android-11.0
 ```
 Sync the latest stable branch
 ```

From 75eb3a612e7c401c5109b955ff6e94ea7f5f6ffc Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Sun, 3 Jul 2022 13:03:22 -0400
Subject: [PATCH 7/7] Add python3 repo

---
 pbrp-extras.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pbrp-extras.xml b/pbrp-extras.xml
index 5f98fc5..a6561ee 100644
--- a/pbrp-extras.xml
+++ b/pbrp-extras.xml
@@ -46,7 +46,9 @@
     <!-- Include ntfs_3g for NTFS support -->
     <project path="external/ntfs-3g" name="android_external_ntfs-3g" remote="LineageOS" revision="lineage-18.1" />
 
-    <project path="hardware/interfaces" name="android_hardware_interfaces" remote="TeamWin" revision="android-11" />
+    <project path="external/python3" name="android_external_python3" remote="TeamWin" revision="android-11"/>
+
+    <project path="hardware/interfaces" name="android_hardware_interfaces" remote="TeamWin" revision="android-11"/>
 
     <!-- System -->
     <project path="system/core" name="system_core" remote="PitchBlackRecoveryProject" revision="android-11.0" />