add note that this branch is not maintained

README.md

@@ -2,7 +2,7 @@
 
 ***
 
-NOTE: Raspberry Vanilla `android-14.0` branch is no longer maintained. Consider using newer AOSP versions.
+NOTE: Raspberry Vanilla `android-14.0.0_r34` branch is not maintained. This branch was only created for backup purposes during Android QPR update. Using this branch is not supported. Consider using newer AOSP versions.
 
 ### How to build (Ubuntu 22.04 LTS):
 
@@ -11,23 +11,23 @@ NOTE: Raspberry Vanilla `android-14.0` branch is no longer maintained. Consider
 2. Install additional packages:
 
 ```
-sudo apt-get install bc coreutils dosfstools e2fsprogs fdisk kpartx mtools ninja-build pkg-config python3-pip rsync
+sudo apt-get install bc coreutils dosfstools e2fsprogs fdisk kpartx mtools ninja-build pkg-config python3-pip
 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_r67
-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
+repo init -u https://android.googlesource.com/platform/manifest -b android-14.0.0_r34
+curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-14.0.0_r34/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_r67 --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
+repo init -u https://android.googlesource.com/platform/manifest -b android-14.0.0_r34 --depth=1
+curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-14.0.0_r34/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.0_r34/remove_projects.xml
 ```
 
 4. Sync source code:
@@ -45,22 +45,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-ap2a-userdebug
+lunch aosp_rpi4-ap1a-userdebug
 ```
 ```
-lunch aosp_rpi4_tv-ap2a-userdebug
+lunch aosp_rpi4_tv-ap1a-userdebug
 ```
 ```
-lunch aosp_rpi4_car-ap2a-userdebug
+lunch aosp_rpi4_car-ap1a-userdebug
 ```
 ```
-lunch aosp_rpi5-ap2a-userdebug
+lunch aosp_rpi5-ap1a-userdebug
 ```
 ```
-lunch aosp_rpi5_tv-ap2a-userdebug
+lunch aosp_rpi5_tv-ap1a-userdebug
 ```
 ```
-lunch aosp_rpi5_car-ap2a-userdebug
+lunch aosp_rpi5_car-ap1a-userdebug
 ```
 
 7. Compile:

manifest_brcm_rpi.xml

@@ -3,13 +3,11 @@
   <remote name="github" fetch="https://github.com/" />
 
   <!-- Raspberry Pi -->
-  <project path="device/brcm/rpi4" name="raspberry-vanilla/android_device_brcm_rpi4" remote="github" revision="android-14.0" >
-    <linkfile src="mkimg.sh" dest="rpi4-mkimg.sh" />
-    <linkfile src="wrimg.sh" dest="rpi4-wrimg.sh" />
+  <project path="device/brcm/rpi4" name="raspberry-vanilla/android_device_brcm_rpi4" remote="github" revision="android-14.0.0_r34" >
+    <linkfile dest="rpi4-mkimg.sh" src="mkimg.sh" />
   </project>
-  <project path="device/brcm/rpi5" name="raspberry-vanilla/android_device_brcm_rpi5" remote="github" revision="android-14.0" >
-    <linkfile src="mkimg.sh" dest="rpi5-mkimg.sh" />
-    <linkfile src="wrimg.sh" dest="rpi5-wrimg.sh" />
+  <project path="device/brcm/rpi5" name="raspberry-vanilla/android_device_brcm_rpi5" remote="github" revision="android-14.0.0_r34" >
+    <linkfile dest="rpi5-mkimg.sh" src="mkimg.sh" />
   </project>
   <project path="device/brcm/rpi4-kernel" name="raspberry-vanilla/android_device_brcm_rpi4-kernel" remote="github" revision="android-14.0" />
   <project path="device/brcm/rpi5-kernel" name="raspberry-vanilla/android_device_brcm_rpi5-kernel" remote="github" revision="android-14.0" />
@@ -22,17 +20,17 @@
   <!-- Build -->
   <remove-project name="platform/build" />
   <remove-project name="platform/build/soong" />
-  <project path="build/make" name="raspberry-vanilla/android_build" remote="github" revision="android-14.0" >
-    <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
-    <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
-    <linkfile src="core" dest="build/core" />
-    <linkfile src="envsetup.sh" dest="build/envsetup.sh" />
-    <linkfile src="target" dest="build/target" />
-    <linkfile src="tools" dest="build/tools" />
+  <project path="build/make" name="raspberry-vanilla/android_build" remote="github" revision="android-14.0.0_r34" >
+    <linkfile dest="build/CleanSpec.mk" src="CleanSpec.mk" />
+    <linkfile dest="build/buildspec.mk.default" src="buildspec.mk.default" />
+    <linkfile dest="build/core" src="core" />
+    <linkfile dest="build/envsetup.sh" src="envsetup.sh" />
+    <linkfile dest="build/target" src="target" />
+    <linkfile dest="build/tools" src="tools" />
   </project>
-  <project path="build/soong" name="raspberry-vanilla/android_build_soong" remote="github" revision="android-14.0" >
-    <linkfile src="root.bp" dest="Android.bp" />
-    <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
+  <project path="build/soong" name="raspberry-vanilla/android_build_soong" remote="github" revision="android-14.0.0_r34" >
+    <linkfile dest="Android.bp" src="root.bp" />
+    <linkfile dest="bootstrap.bash" src="bootstrap.bash" />
   </project>
 
   <!-- Camera -->
@@ -54,18 +52,18 @@
   <remove-project name="platform/external/mesa3d" />
   <remove-project name="platform/external/minigbm" />
   <project path="external/drm_hwcomposer" name="raspberry-vanilla/android_external_drm_hwcomposer" remote="github" revision="android-14.0" />
-  <project path="external/libdrm" name="raspberry-vanilla/android_external_libdrm" remote="github" revision="android-14.0" />
+  <project path="external/libdrm" name="raspberry-vanilla/android_external_libdrm" remote="github" revision="android-14.0.0_r34" />
   <project path="external/mesa3d" name="raspberry-vanilla/android_external_mesa3d" remote="github" revision="android-14.0" />
-  <project path="external/minigbm" name="raspberry-vanilla/android_external_minigbm" remote="github" revision="android-14.0" />
+  <project path="external/minigbm" name="raspberry-vanilla/android_external_minigbm" remote="github" revision="android-14.0.0_r34" />
 
   <!-- v4l2_codec2 -->
   <remove-project name="platform/external/v4l2_codec2" />
-  <project path="external/v4l2_codec2" name="raspberry-vanilla/android_external_v4l2_codec2" remote="github" revision="android-14.0" />
+  <project path="external/v4l2_codec2" name="raspberry-vanilla/android_external_v4l2_codec2" remote="github" revision="android-14.0.0_r34" />
 
   <!-- Wifi -->
   <remove-project name="platform/external/wpa_supplicant_8" />
   <remove-project name="platform/packages/modules/Wifi" />
   <project path="external/wpa_supplicant_8" name="raspberry-vanilla/android_external_wpa_supplicant_8" remote="github" revision="android-14.0" />
-  <project path="packages/modules/Wifi" name="raspberry-vanilla/android_packages_modules_Wifi" remote="github" revision="android-14.0" />
+  <project path="packages/modules/Wifi" name="raspberry-vanilla/android_packages_modules_Wifi" remote="github" revision="android-14.0.0_r34" />
 
 </manifest>

remove_projects.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remove-project name="device/google/akita" />
-  <remove-project name="device/google/akita-sepolicy" />
-  <remove-project name="device/google/akita-kernel" />
   <remove-project name="device/amlogic/yukawa" />
   <remove-project name="device/amlogic/yukawa-kernel" />
   <remove-project name="device/google/barbet" />
@@ -81,6 +78,7 @@
   <remove-project name="platform/hardware/qcom/sm8150/vr" />
   <remove-project name="platform/hardware/qcom/sm8150p/gps" />
   <remove-project name="platform/hardware/qcom/wlan" />
+  <remove-project name="platform/hardware/st/nfc" />
   <remove-project name="platform/hardware/st/secure_element" />
   <remove-project name="platform/hardware/st/secure_element2" />
   <remove-project name="platform/hardware/samsung/nfc" />