add note that this branch is not maintained

branch out android-15.0.0_r4
remove packages/modules/Bluetooth from device manifest
2024-12-20 22:08:56 +02:00 · 2024-12-09 14:44:48 +02:00 · 2024-11-23 15:55:26 +02:00 · 2024-11-07 13:09:12 +02:00 · 2024-10-22 13:09:00 +03:00 · 2024-10-16 11:20:57 +03:00
4 changed files with 68 additions and 59 deletions
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-### Device specific configuration to build AOSP Android 14 for Raspberry Pi 4 and Raspberry Pi 5.
+### Device specific configuration to build AOSP Android 15 for Raspberry Pi 4 and Raspberry Pi 5.

 ***

-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.
+NOTE: Raspberry Vanilla `android-15.0.0_r4` 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):

@@ -18,16 +18,16 @@ 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_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
+repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r4
+curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0.0_r4/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_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
+repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r4 --depth=1
+curl -o .repo/local_manifests/manifest_brcm_rpi.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0.0_r4/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.0_r4/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-ap1a-userdebug
+lunch aosp_rpi4-ap3a-userdebug
 ```
 ```
-lunch aosp_rpi4_tv-ap1a-userdebug
+lunch aosp_rpi4_tv-ap3a-userdebug
 ```
 ```
-lunch aosp_rpi4_car-ap1a-userdebug
+lunch aosp_rpi4_car-ap3a-userdebug
 ```
 ```
-lunch aosp_rpi5-ap1a-userdebug
+lunch aosp_rpi5-ap3a-userdebug
 ```
 ```
-lunch aosp_rpi5_tv-ap1a-userdebug
+lunch aosp_rpi5_tv-ap3a-userdebug
 ```
 ```
-lunch aosp_rpi5_car-ap1a-userdebug
+lunch aosp_rpi5_car-ap3a-userdebug
 ```

 7. Compile:
@@ -78,7 +78,7 @@ make bootimage systemimage vendorimage -j$(nproc)
 ./rpi5-mkimg.sh
 ```

-Also look into [Linux kernel build instructions](https://github.com/raspberry-vanilla/android_kernel_manifest/tree/android-14.0).
+Also look into [Linux kernel build instructions](https://github.com/raspberry-vanilla/android_kernel_manifest/tree/android-15.0).

 ***

--- a/manifest_brcm_rpi.xml
+++ b/manifest_brcm_rpi.xml
@@ -3,67 +3,67 @@
  <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.0_r34" >
-    <linkfile dest="rpi4-mkimg.sh" src="mkimg.sh" />
+  <project path="device/brcm/rpi4" name="raspberry-vanilla/android_device_brcm_rpi4" remote="github" revision="android-15.0.0_r4" >
+    <linkfile src="mkimg.sh" dest="rpi4-mkimg.sh" />
  </project>
-  <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 path="device/brcm/rpi5" name="raspberry-vanilla/android_device_brcm_rpi5" remote="github" revision="android-15.0.0_r4" >
+    <linkfile src="mkimg.sh" dest="rpi5-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" />
-  <project path="vendor/brcm" name="raspberry-vanilla/proprietary_vendor_brcm" remote="github" revision="android-14.0" />
+  <project path="device/brcm/rpi4-kernel" name="raspberry-vanilla/android_device_brcm_rpi4-kernel" remote="github" revision="android-15.0" />
+  <project path="device/brcm/rpi5-kernel" name="raspberry-vanilla/android_device_brcm_rpi5-kernel" remote="github" revision="android-15.0" />
+  <project path="vendor/brcm" name="raspberry-vanilla/proprietary_vendor_brcm" remote="github" revision="android-15.0" />

  <!-- Audio -->
-  <project path="external/alsa-lib" name="raspberry-vanilla/android_external_alsa-lib" remote="github" revision="android-14.0" />
-  <project path="external/alsa-utils" name="raspberry-vanilla/android_external_alsa-utils" remote="github" revision="android-14.0" />
+  <project path="external/alsa-lib" name="raspberry-vanilla/android_external_alsa-lib" remote="github" revision="android-15.0" />
+  <project path="external/alsa-utils" name="raspberry-vanilla/android_external_alsa-utils" remote="github" revision="android-15.0" />

  <!-- 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.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 path="build/make" name="raspberry-vanilla/android_build" remote="github" revision="android-15.0.0_r4" >
+    <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>
-  <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 path="build/soong" name="raspberry-vanilla/android_build_soong" remote="github" revision="android-15.0.0_r4" >
+    <linkfile src="root.bp" dest="Android.bp" />
+    <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
  </project>

  <!-- Camera -->
-  <project path="external/libcamera" name="raspberry-vanilla/android_external_libcamera" remote="github" revision="android-14.0" />
-  <project path="external/libpisp" name="raspberry-vanilla/android_external_libpisp" remote="github" revision="android-14.0" />
-  <project path="external/libyaml" name="raspberry-vanilla/android_external_libyaml" remote="github" revision="android-14.0" />
-  <project path="external/libyuv_chromium" name="raspberry-vanilla/android_external_libyuv_chromium" remote="github" revision="android-14.0" />
+  <project path="external/libcamera" name="raspberry-vanilla/android_external_libcamera" remote="github" revision="android-15.0" />
+  <project path="external/libpisp" name="raspberry-vanilla/android_external_libpisp" remote="github" revision="android-15.0" />
+  <project path="external/libyaml" name="raspberry-vanilla/android_external_libyaml" remote="github" revision="android-15.0" />
+  <project path="external/libyuv_chromium" name="raspberry-vanilla/android_external_libyuv_chromium" remote="github" revision="android-15.0" />

  <!-- FFmpeg -->
  <remove-project name="platform/external/libdav1d" />
-  <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" />
+  <project path="external/ffmpeg" name="raspberry-vanilla/android_external_ffmpeg" remote="github" revision="android-15.0" />
+  <project path="external/ffmpeg_codec2" name="raspberry-vanilla/android_external_ffmpeg_codec2" remote="github" revision="android-15.0" />
+  <project path="external/libdav1d" name="raspberry-vanilla/android_external_libdav1d" remote="github" revision="android-15.0" />
+  <project path="external/libudev-zero" name="raspberry-vanilla/android_external_libudev-zero" remote="github" revision="android-15.0" />

  <!-- Graphics -->
  <remove-project name="platform/external/drm_hwcomposer" />
  <remove-project name="platform/external/libdrm" />
  <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.0_r34" />
+  <project path="external/drm_hwcomposer" name="raspberry-vanilla/android_external_drm_hwcomposer" remote="github" revision="android-15.0" />
+  <project path="external/libdrm" name="raspberry-vanilla/android_external_libdrm" remote="github" revision="android-15.0.0_r4" />
  <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.0_r34" />
+  <project path="external/minigbm" name="raspberry-vanilla/android_external_minigbm" remote="github" revision="android-15.0.0_r4" />

  <!-- 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.0_r34" />
+  <project path="external/v4l2_codec2" name="raspberry-vanilla/android_external_v4l2_codec2" remote="github" revision="android-15.0" />

  <!-- 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.0_r34" />
+  <project path="external/wpa_supplicant_8" name="raspberry-vanilla/android_external_wpa_supplicant_8" remote="github" revision="android-15.0.0_r4" />
+  <project path="packages/modules/Wifi" name="raspberry-vanilla/android_packages_modules_Wifi" remote="github" revision="android-15.0.0_r4" />

 </manifest>
--- a/manifest_utilities.xml
+++ b/manifest_utilities.xml
@@ -3,7 +3,7 @@
  <remote name="github" fetch="https://github.com/" />

  <!-- Utilities -->
-  <project path="external/raspberrypi-utils" name="raspberry-vanilla/android_external_raspberrypi-utils" remote="github" revision="android-14.0" />
-  <project path="external/v4l-utils" name="raspberry-vanilla/android_external_v4l-utils" remote="github" revision="android-14.0" />
+  <project path="external/raspberrypi-utils" name="raspberry-vanilla/android_external_raspberrypi-utils" remote="github" revision="android-15.0" />
+  <project path="external/v4l-utils" name="raspberry-vanilla/android_external_v4l-utils" remote="github" revision="android-15.0" />

 </manifest>
--- a/remove_projects.xml
+++ b/remove_projects.xml
@@ -1,21 +1,29 @@
 <?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-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-kernel" />
-  <remove-project name="device/google/bramble" />
-  <remove-project name="device/google/bramble-sepolicy" />
+  <remove-project name="device/google/bluejay-kernels/5.10" />
+  <remove-project name="device/google/caimito" />
+  <remove-project name="device/google/caimito-kernels/6.1" />
+  <remove-project name="device/google/caimito-sepolicy" />
+  <remove-project name="device/google/comet" />
+  <remove-project name="device/google/comet-kernels/6.1" />
+  <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-kernel" />
+  <remove-project name="device/google/felix-kernels/5.10" />
  <remove-project name="device/google/gs101" />
  <remove-project name="device/google/gs101-sepolicy" />
  <remove-project name="device/google/gs201" />
@@ -23,12 +31,12 @@
  <remove-project name="device/google/gs-common" />
  <remove-project name="device/google/lynx" />
  <remove-project name="device/google/lynx-sepolicy" />
-  <remove-project name="device/google/lynx-kernel" />
+  <remove-project name="device/google/lynx-kernels/5.10" />
  <remove-project name="device/google/pantah" />
  <remove-project name="device/google/pantah-sepolicy" />
-  <remove-project name="device/google/pantah-kernel" />
+  <remove-project name="device/google/pantah-kernels/5.10" />
  <remove-project name="device/google/raviole" />
-  <remove-project name="device/google/raviole-kernel" />
+  <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" />
@@ -36,16 +44,18 @@
  <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-kernel" />
+  <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-kernel" />
+  <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" />
+  <remove-project name="device/google/zumapro" />
+  <remove-project name="device/google/zumapro-sepolicy" />
  <remove-project name="device/linaro/dragonboard" />
  <remove-project name="device/linaro/dragonboard-kernel" />
  <remove-project name="device/linaro/hikey" />
@@ -78,7 +88,6 @@
  <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" />
Author	SHA1	Message	Date
Konsta	5098b5047d	add note that this branch is not maintained	2024-12-20 22:08:56 +02:00
Konsta	941b926ca1	branch out android-15.0.0_r4	2024-12-09 14:44:48 +02:00
Konsta	f56d4e3e6e	remove packages/modules/Bluetooth from device manifest * No longer needed after switching bluetooth to AIDL HAL. `1ae3ede91b` `fe5a39b067`	2024-11-23 15:55:26 +02:00
Konsta	ca7c981c4b	update to android-15.0.0_r4	2024-11-07 13:09:12 +02:00
Konsta	f3dfe83910	update link to AOSP documentation and note recommended build environment	2024-10-22 13:09:00 +03:00
Konsta	cd6b8cf204	update to android-15.0.0_r2	2024-10-16 11:20:57 +03:00
Konsta	44db505f22	update to android-15.0.0_r1	2024-09-06 12:12:35 +03:00
Konsta	b790d93bab	update to android-14.0.0_r67	2024-09-04 19:10:45 +03:00
Konsta	765e7f2d97	update to android-14.0.0_r55	2024-08-07 13:11:34 +03:00
Konsta	d84f513987	update to android-14.0.0_r52	2024-07-03 14:25:49 +03:00
Konsta	6ae8acffbd	fix copy&paste failure on android-14.0.0_r50 * Fixes https://github.com/raspberry-vanilla/android_local_manifest/issues/104.	2024-07-02 23:34:21 +03:00
Konsta	e7c339459e	update to android-14.0.0_r50	2024-06-12 13:07:50 +03:00