add note that this branch is not maintained

update link to AOSP documentation and note recommended build environment
branch out android-14.0.0_r34
2024-12-20 22:08:00 +02:00 · 2024-10-22 13:12:56 +03:00 · 2024-06-12 18:46:35 +03:00 · 2024-05-08 17:19:04 +03:00 · 2024-04-30 13:24:48 +03:00 · 2024-04-30 13:11:55 +03:00
4 changed files with 81 additions and 65 deletions
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
-### Device specific configuration to build AOSP Android 13 for Raspberry Pi 4.
+### Device specific configuration to build AOSP Android 14 for Raspberry Pi 4 and Raspberry Pi 5.

 ***

-### How to build:
+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.

-1. Establish [Android build environment](https://source.android.com/setup/initializing) and install [repo](https://source.android.com/docs/setup/develop#installing-repo).
+### How to build (Ubuntu 22.04 LTS):
+
+1. Establish [Android build environment](https://source.android.com/docs/setup/start/requirements).

 2. Install additional packages:

@@ -16,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-13.0.0_r75
-curl --create-dirs -L -o .repo/local_manifests/manifest_brcm_rpi4.xml -O -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-13.0/manifest_brcm_rpi4.xml
+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-13.0.0_r75 --depth=1
-curl --create-dirs -L -o .repo/local_manifests/manifest_brcm_rpi4.xml -O -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-13.0/manifest_brcm_rpi4.xml
-curl --create-dirs -L -o .repo/local_manifests/remove_projects.xml -O -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-13.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:
@@ -40,35 +42,43 @@ repo sync
 . build/envsetup.sh
 ```

-6. Select build target:
+6. Select the device (`rpi4` or `rpi5`) and build target (tablet UI, `tv` for Android TV, or `car` for Android Automotive):

-Tablet UI:
 ```
-lunch aosp_rpi4-userdebug
+lunch aosp_rpi4-ap1a-userdebug
 ```
-
-Android TV:
 ```
-lunch aosp_rpi4_tv-userdebug
+lunch aosp_rpi4_tv-ap1a-userdebug
 ```
-
-Android Automotive:
 ```
-lunch aosp_rpi4_car-userdebug
+lunch aosp_rpi4_car-ap1a-userdebug
+```
+```
+lunch aosp_rpi5-ap1a-userdebug
+```
+```
+lunch aosp_rpi5_tv-ap1a-userdebug
+```
+```
+lunch aosp_rpi5_car-ap1a-userdebug
 ```

 7. Compile:
+
 ```
 make bootimage systemimage vendorimage -j$(nproc)
 ```

-8. Make flashable image:
+8. Make flashable image for the device (`rpi4` or `rpi5`):

 ```
 ./rpi4-mkimg.sh
 ```
+```
+./rpi5-mkimg.sh
+```

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

 ***

@@ -87,4 +97,5 @@ Also look into [Linux kernel build instructions](https://github.com/raspberry-va
 - [HDMI-CEC](https://github.com/raspberry-vanilla/android_local_manifest/wiki/HDMI-CEC)
 - [Interfaces](https://github.com/raspberry-vanilla/android_local_manifest/wiki/Interfaces)
 - [USB boot](https://github.com/raspberry-vanilla/android_local_manifest/wiki/USB-boot)
+- [Utilities](https://github.com/raspberry-vanilla/android_local_manifest/wiki/Utilities)
 - [Video decoding & encoding](https://github.com/raspberry-vanilla/android_local_manifest/wiki/Video-decoding-&-encoding)
--- a/manifest_brcm_rpi4.xml
+++ b/manifest_brcm_rpi4.xml
@@ -3,59 +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-13.0" >
-    <linkfile src="mkimg.sh" dest="rpi4-mkimg.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/rpi4-kernel" name="raspberry-vanilla/android_device_brcm_rpi4-kernel" remote="github" revision="android-13.0" />
-  <project path="vendor/brcm" name="raspberry-vanilla/proprietary_vendor_brcm" remote="github" revision="android-13.0" />
+  <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" />
+  <project path="vendor/brcm" name="raspberry-vanilla/proprietary_vendor_brcm" remote="github" revision="android-14.0" />

  <!-- Audio -->
-  <project path="external/alsa-lib" name="raspberry-vanilla/android_external_alsa-lib" remote="github" revision="android-13.0" />
-  <project path="external/alsa-utils" name="raspberry-vanilla/android_external_alsa-utils" remote="github" revision="android-13.0" />
+  <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" />

  <!-- 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-13.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-13.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 -->
-  <project path="external/libcamera" name="raspberry-vanilla/android_external_libcamera" remote="github" revision="android-13.0" />
-  <project path="external/libyaml" name="raspberry-vanilla/android_external_libyaml" remote="github" revision="android-13.0" />
-  <project path="external/libyuv_chromium" name="raspberry-vanilla/android_external_libyuv_chromium" remote="github" revision="android-13.0" />
+  <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" />

  <!-- FFmpeg -->
-  <project path="external/dav1d" name="raspberry-vanilla/android_external_dav1d" remote="github" revision="android-13.0" />
-  <project path="external/ffmpeg" name="raspberry-vanilla/android_external_ffmpeg" remote="github" revision="android-13.0" />
-  <project path="external/ffmpeg_codec2" name="raspberry-vanilla/android_external_ffmpeg_codec2" remote="github" revision="android-13.0" />
-  <project path="external/libudev-zero" name="raspberry-vanilla/android_external_libudev-zero" remote="github" revision="android-13.0" />
+  <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" />

  <!-- 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-13.0" />
-  <project path="external/libdrm" name="raspberry-vanilla/android_external_libdrm" remote="github" revision="android-13.0" />
-  <project path="external/mesa3d" name="raspberry-vanilla/android_external_mesa3d" remote="github" revision="android-13.0" />
-  <project path="external/minigbm" name="raspberry-vanilla/android_external_minigbm" remote="github" revision="android-13.0" />
+  <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/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" />

  <!-- 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-13.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="packages/modules/Wifi" name="raspberry-vanilla/android_packages_modules_Wifi" remote="github" revision="android-13.0" />
+  <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" />

 </manifest>
--- a/manifest_utilities.xml
+++ b/manifest_utilities.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <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" />
+
+</manifest>
--- a/remove_projects.xml
+++ b/remove_projects.xml
@@ -37,19 +37,21 @@
  <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/shusky" />
+  <remove-project name="device/google/shusky-sepolicy" />
+  <remove-project name="device/google/shusky-kernel" />
  <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/linaro/dragonboard" />
  <remove-project name="device/linaro/dragonboard-kernel" />
  <remove-project name="device/linaro/hikey" />
  <remove-project name="device/linaro/hikey-kernel" />
  <remove-project name="device/linaro/poplar" />
  <remove-project name="device/linaro/poplar-kernel" />
-  <remove-project name="device/mediatek/wembley-sepolicy" />
-  <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" />
@@ -63,21 +65,7 @@
  <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/msm8960" />
-  <remove-project name="platform/hardware/qcom/msm8994" />
-  <remove-project name="platform/hardware/qcom/msm8996" />
-  <remove-project name="platform/hardware/qcom/msm8x09" />
-  <remove-project name="platform/hardware/qcom/msm8x26" />
-  <remove-project name="platform/hardware/qcom/msm8x27" />
-  <remove-project name="platform/hardware/qcom/msm8x84" />
  <remove-project name="platform/hardware/qcom/power" />
-  <remove-project name="platform/hardware/qcom/sdm845/bt" />
-  <remove-project name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" />
-  <remove-project name="platform/hardware/qcom/sdm845/display" />
-  <remove-project name="platform/hardware/qcom/sdm845/gps" />
-  <remove-project name="platform/hardware/qcom/sdm845/media" />
-  <remove-project name="platform/hardware/qcom/sdm845/thermal" />
-  <remove-project name="platform/hardware/qcom/sdm845/vr" />
  <remove-project name="platform/hardware/qcom/sm7150/gps" />
  <remove-project name="platform/hardware/qcom/sm7250/display" />
  <remove-project name="platform/hardware/qcom/sm7250/gps" />
Author	SHA1	Message	Date
Konsta	62ee6d7e98	add note that this branch is not maintained	2024-12-20 22:08:00 +02:00
Konsta	3a6781ea08	update link to AOSP documentation and note recommended build environment	2024-10-22 13:12:56 +03:00
Konsta	d3c0476092	branch out android-14.0.0_r34	2024-06-12 18:46:35 +03:00
Konsta	0b06d20e60	update to android-14.0.0_r34	2024-05-08 17:19:04 +03:00
Konsta	a9bbff2c52	switch order of src and dest for symlinks in device manifest * Changed in AOSP14 QPR2.	2024-04-30 13:24:48 +03:00
Konsta	e63e7fc040	add libdav1d to device manifest * AOSP implementation is not ready yet.	2024-04-30 13:11:55 +03:00
Konsta	3bda82ae8c	update to android-14.0.0_r30	2024-04-04 16:22:55 +03:00
Konsta	a6af80b359	update to android-14.0.0_r29	2024-04-04 14:35:05 +03:00
Konsta	ee932f2f03	update to android-14.0.0_r22	2024-02-06 15:43:44 +02:00
Konsta	7249cd5260	update to android-14.0.0_r20	2024-01-04 16:32:10 +02:00
Konsta	6d9c8a9b91	Revert "temporarily add mockito-kotlin to device manifest" * No longer needed as this was fixed upstream. * This reverts commit `c53a0f3021`.	2023-12-22 12:06:57 +02:00
Konsta	c53a0f3021	temporarily add mockito-kotlin to device manifest * Missing from android-14.0.0_r17 manifest but needed because of `625a23ff22`.	2023-12-07 20:10:06 +02:00
Konsta	78340f07ac	update to android-14.0.0_r17	2023-12-07 20:08:58 +02:00
Konsta	3e569aed9e	add build instructions for Raspberry Pi 5	2023-11-24 15:33:34 +02:00
Konsta	783d98c10d	add rpi5 repositories to device manifest	2023-11-24 15:08:17 +02:00
Konsta	a26dee09f8	add external/wpa_supplicant_8 to device manifest * See https://github.com/raspberry-vanilla/android_local_manifest/issues/29.	2023-11-24 15:02:22 +02:00
Konsta	592bc68db9	rename dav1d -> libdav1d * Google has added option for using libdav1d for AV1 software decoding in future Android versions (excellent idea wherever they got it ;)). * Rename the repo to follow AOSP naming convention.	2023-11-24 14:43:37 +02:00
Konsta	fd4dc8530f	update to android-14.0.0_r14	2023-11-07 10:13:32 +02:00
Konsta	53efc065d2	add manifest fragment for utilities	2023-11-04 16:19:36 +02:00
Konsta	b106c5f62b	wiki: add utilities	2023-11-04 16:19:28 +02:00
Konsta	4d4882c1d8	remove unneeded curl arguments	2023-11-04 13:37:18 +02:00
Konsta	552d88ade4	update to android-14.0.0_r1	2023-10-12 11:00:56 +03:00