From a6af80b359adeb1f82cbfac19c0b7844ead82f86 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Tue, 5 Mar 2024 13:15:49 +0200
Subject: [PATCH] update to android-14.0.0_r29

---
 README.md             | 16 ++++++++--------
 manifest_brcm_rpi.xml |  1 -
 remove_projects.xml   |  2 --
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 5d2e310..60a9700 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-14.0.0_r22
+repo init -u https://android.googlesource.com/platform/manifest -b android-14.0.0_r29
 curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-14.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-14.0.0_r22 --depth=1
+repo init -u https://android.googlesource.com/platform/manifest -b android-14.0.0_r29 --depth=1
 curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-14.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-14.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-userdebug
+lunch aosp_rpi4-ap1a-userdebug
 ```
 ```
-lunch aosp_rpi4_tv-userdebug
+lunch aosp_rpi4_tv-ap1a-userdebug
 ```
 ```
-lunch aosp_rpi4_car-userdebug
+lunch aosp_rpi4_car-ap1a-userdebug
 ```
 ```
-lunch aosp_rpi5-userdebug
+lunch aosp_rpi5-ap1a-userdebug
 ```
 ```
-lunch aosp_rpi5_tv-userdebug
+lunch aosp_rpi5_tv-ap1a-userdebug
 ```
 ```
-lunch aosp_rpi5_car-userdebug
+lunch aosp_rpi5_car-ap1a-userdebug
 ```
 
 7. Compile:
diff --git a/manifest_brcm_rpi.xml b/manifest_brcm_rpi.xml
index 2fc54be..8730419 100644
--- a/manifest_brcm_rpi.xml
+++ b/manifest_brcm_rpi.xml
@@ -42,7 +42,6 @@
   <!-- FFmpeg -->
   <project path="external/ffmpeg" name="raspberry-vanilla/android_external_ffmpeg" remote="github" revision="android-14.0" />
   <project path="external/ffmpeg_codec2" name="raspberry-vanilla/android_external_ffmpeg_codec2" remote="github" revision="android-14.0" />
-  <project path="external/libdav1d" name="raspberry-vanilla/android_external_libdav1d" remote="github" revision="android-14.0" />
   <project path="external/libudev-zero" name="raspberry-vanilla/android_external_libudev-zero" remote="github" revision="android-14.0" />
 
   <!-- Graphics -->
diff --git a/remove_projects.xml b/remove_projects.xml
index 542c189..292cbee 100644
--- a/remove_projects.xml
+++ b/remove_projects.xml
@@ -52,8 +52,6 @@
   <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="platform/hardware/invensense" />
   <remove-project name="platform/hardware/knowles/athletico/sound_trigger_hal" />
   <remove-project name="platform/hardware/nxp/nfc" />