From b264ffd4bde5dc11e943ad0d199116c8607f3b9e Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Fri, 6 Dec 2024 12:59:00 +0200
Subject: [PATCH] update to android-15.0.0_r6

---
 README.md           | 16 ++++++++--------
 remove_projects.xml | 38 +++-----------------------------------
 2 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index 010d2a8..2df10e5 100644
--- a/README.md
+++ b/README.md
@@ -16,14 +16,14 @@ sudo pip3 install meson mako jinja2 ply pyyaml dataclasses
 3. Initialize repo:
 
 ```
-repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r4
+repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r6
 curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0/manifest_brcm_rpi.xml --create-dirs
 ```
 
 Or optionally, you can reduce download size by creating a shallow clone and removing unneeded projects:
 
 ```
-repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r4 --depth=1
+repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r6 --depth=1
 curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0/manifest_brcm_rpi.xml --create-dirs
 curl -o .repo/local_manifests/remove_projects.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0/remove_projects.xml
 ```
@@ -43,22 +43,22 @@ repo sync
 6. Select the device (`rpi4` or `rpi5`) and build target (tablet UI, `tv` for Android TV, or `car` for Android Automotive):
 
 ```
-lunch aosp_rpi4-ap3a-userdebug
+lunch aosp_rpi4-ap4a-userdebug
 ```
 ```
-lunch aosp_rpi4_tv-ap3a-userdebug
+lunch aosp_rpi4_tv-ap4a-userdebug
 ```
 ```
-lunch aosp_rpi4_car-ap3a-userdebug
+lunch aosp_rpi4_car-ap4a-userdebug
 ```
 ```
-lunch aosp_rpi5-ap3a-userdebug
+lunch aosp_rpi5-ap4a-userdebug
 ```
 ```
-lunch aosp_rpi5_tv-ap3a-userdebug
+lunch aosp_rpi5_tv-ap4a-userdebug
 ```
 ```
-lunch aosp_rpi5_car-ap3a-userdebug
+lunch aosp_rpi5_car-ap4a-userdebug
 ```
 
 7. Compile:
diff --git a/remove_projects.xml b/remove_projects.xml
index 1f03dd6..123501f 100644
--- a/remove_projects.xml
+++ b/remove_projects.xml
@@ -5,8 +5,6 @@
   <remove-project name="device/google/akita-kernels/5.15" />
   <remove-project name="device/amlogic/yukawa" />
   <remove-project name="device/amlogic/yukawa-kernel" />
-  <remove-project name="device/google/barbet" />
-  <remove-project name="device/google/barbet-sepolicy" />
   <remove-project name="device/google/bluejay" />
   <remove-project name="device/google/bluejay-sepolicy" />
   <remove-project name="device/google/bluejay-kernels/5.10" />
@@ -18,9 +16,6 @@
   <remove-project name="device/google/comet-sepolicy" />
   <remove-project name="device/google/common/etm" />
   <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/felix" />
   <remove-project name="device/google/felix-sepolicy" />
   <remove-project name="device/google/felix-kernels/5.10" />
@@ -37,20 +32,12 @@
   <remove-project name="device/google/pantah-kernels/5.10" />
   <remove-project name="device/google/raviole" />
   <remove-project name="device/google/raviole-kernels/5.10" />
-  <remove-project name="device/google/redbull" />
-  <remove-project name="device/google/redbull-kernel" />
-  <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/tangorpro" />
   <remove-project name="device/google/tangorpro-sepolicy" />
   <remove-project name="device/google/tangorpro-kernels/5.10" />
   <remove-project name="device/google/shusky" />
   <remove-project name="device/google/shusky-sepolicy" />
   <remove-project name="device/google/shusky-kernels/5.15" />
-  <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/trout" />
   <remove-project name="device/google/zuma" />
   <remove-project name="device/google/zuma-sepolicy" />
@@ -63,30 +50,11 @@
   <remove-project name="device/linaro/poplar" />
   <remove-project name="device/linaro/poplar-kernel" />
   <remove-project name="platform/hardware/invensense" />
-  <remove-project name="platform/hardware/knowles/athletico/sound_trigger_hal" />
+  <remove-project name="platform/hardware/nxp/keymint" />
   <remove-project name="platform/hardware/nxp/nfc" />
+  <remove-project name="platform/hardware/nxp/uwb" />
   <remove-project name="platform/hardware/nxp/secure_element" />
-  <remove-project name="platform/hardware/qcom/audio" />
-  <remove-project name="platform/hardware/qcom/bootctrl" />
-  <remove-project name="platform/hardware/qcom/bt" />
-  <remove-project name="platform/hardware/qcom/camera" />
-  <remove-project name="platform/hardware/qcom/data/ipacfg-mgr" />
-  <remove-project name="platform/hardware/qcom/display" />
-  <remove-project name="platform/hardware/qcom/gps" />
-  <remove-project name="platform/hardware/qcom/keymaster" />
-  <remove-project name="platform/hardware/qcom/media" />
-  <remove-project name="platform/hardware/qcom/power" />
-  <remove-project name="platform/hardware/qcom/sm7150/gps" />
-  <remove-project name="platform/hardware/qcom/sm7250/display" />
-  <remove-project name="platform/hardware/qcom/sm7250/gps" />
-  <remove-project name="platform/hardware/qcom/sm7250/media" />
-  <remove-project name="platform/hardware/qcom/sm8150/data/ipacfg-mgr" />
-  <remove-project name="platform/hardware/qcom/sm8150/display" />
-  <remove-project name="platform/hardware/qcom/sm8150/gps" />
-  <remove-project name="platform/hardware/qcom/sm8150/media" />
-  <remove-project name="platform/hardware/qcom/sm8150/thermal" />
-  <remove-project name="platform/hardware/qcom/sm8150/vr" />
-  <remove-project name="platform/hardware/qcom/sm8150p/gps" />
+  <remove-project name="platform/hardware/nxp/weaver" />
   <remove-project name="platform/hardware/qcom/wlan" />
   <remove-project name="platform/hardware/st/secure_element" />
   <remove-project name="platform/hardware/st/secure_element2" />