PawletOS/android_local_manifest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to android-15.0.0_r1

Browse Source
This commit is contained in:
Konsta
2024-09-04 19:14:07 +03:00
parent b790d93bab
commit 44db505f22
4 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
README.md
View File

@@ -1,4 +1,4 @@
### 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.
*** ***
@@ -16,16 +16,16 @@ sudo pip3 install meson mako jinja2 ply pyyaml dataclasses
3. Initialize repo: 3. Initialize repo:
``` ```
repo init -u https://android.googlesource.com/platform/manifest -b android-14.0.0_r67 repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r1
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/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: 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 repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r1 --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/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-14.0/remove_projects.xml curl -o .repo/local_manifests/remove_projects.xml -L https://raw.githubusercontent.com/raspberry-vanilla/android_local_manifest/android-15.0/remove_projects.xml
``` ```
4. Sync source code: 4. Sync source code:
@@ -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): 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-ap3a-userdebug
``` ```
``` ```
lunch aosp_rpi4_tv-ap2a-userdebug lunch aosp_rpi4_tv-ap3a-userdebug
``` ```
``` ```
lunch aosp_rpi4_car-ap2a-userdebug lunch aosp_rpi4_car-ap3a-userdebug
``` ```
``` ```
lunch aosp_rpi5-ap2a-userdebug lunch aosp_rpi5-ap3a-userdebug
``` ```
``` ```
lunch aosp_rpi5_tv-ap2a-userdebug lunch aosp_rpi5_tv-ap3a-userdebug
``` ```
``` ```
lunch aosp_rpi5_car-ap2a-userdebug lunch aosp_rpi5_car-ap3a-userdebug
``` ```
7. Compile: 7. Compile:
@@ -76,7 +76,7 @@ make bootimage systemimage vendorimage -j$(nproc)
./rpi5-mkimg.sh ./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).
*** ***

52
manifest_brcm_rpi.xml
View File

@@ -3,24 +3,28 @@
<remote name="github" fetch="https://github.com/" /> <remote name="github" fetch="https://github.com/" />
<!-- Raspberry Pi --> <!-- Raspberry Pi -->
<project path="device/brcm/rpi4" name="raspberry-vanilla/android_device_brcm_rpi4" remote="github" revision="android-14.0" > <project path="device/brcm/rpi4" name="raspberry-vanilla/android_device_brcm_rpi4" remote="github" revision="android-15.0" >
<linkfile src="mkimg.sh" dest="rpi4-mkimg.sh" /> <linkfile src="mkimg.sh" dest="rpi4-mkimg.sh" />
</project> </project>
<project path="device/brcm/rpi5" name="raspberry-vanilla/android_device_brcm_rpi5" remote="github" revision="android-14.0" > <project path="device/brcm/rpi5" name="raspberry-vanilla/android_device_brcm_rpi5" remote="github" revision="android-15.0" >
<linkfile src="mkimg.sh" dest="rpi5-mkimg.sh" /> <linkfile src="mkimg.sh" dest="rpi5-mkimg.sh" />
</project> </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/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-14.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-14.0" /> <project path="vendor/brcm" name="raspberry-vanilla/proprietary_vendor_brcm" remote="github" revision="android-15.0" />
<!-- Audio --> <!-- Audio -->
<project path="external/alsa-lib" name="raspberry-vanilla/android_external_alsa-lib" 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-14.0" /> <project path="external/alsa-utils" name="raspberry-vanilla/android_external_alsa-utils" remote="github" revision="android-15.0" />
<!-- Bluetooth -->
<remove-project name="platform/packages/modules/Bluetooth" />
<project path="packages/modules/Bluetooth" name="raspberry-vanilla/android_packages_modules_Bluetooth" remote="github" revision="android-15.0" />
<!-- Build --> <!-- Build -->
<remove-project name="platform/build" /> <remove-project name="platform/build" />
<remove-project name="platform/build/soong" /> <remove-project name="platform/build/soong" />
<project path="build/make" name="raspberry-vanilla/android_build" remote="github" revision="android-14.0" > <project path="build/make" name="raspberry-vanilla/android_build" remote="github" revision="android-15.0" >
<linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" /> <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
<linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" /> <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
<linkfile src="core" dest="build/core" /> <linkfile src="core" dest="build/core" />
@@ -28,42 +32,42 @@
<linkfile src="target" dest="build/target" /> <linkfile src="target" dest="build/target" />
<linkfile src="tools" dest="build/tools" /> <linkfile src="tools" dest="build/tools" />
</project> </project>
<project path="build/soong" name="raspberry-vanilla/android_build_soong" remote="github" revision="android-14.0" > <project path="build/soong" name="raspberry-vanilla/android_build_soong" remote="github" revision="android-15.0" >
<linkfile src="root.bp" dest="Android.bp" /> <linkfile src="root.bp" dest="Android.bp" />
<linkfile src="bootstrap.bash" dest="bootstrap.bash" /> <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
</project> </project>
<!-- Camera --> <!-- Camera -->
<project path="external/libcamera" name="raspberry-vanilla/android_external_libcamera" 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-14.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-14.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-14.0" /> <project path="external/libyuv_chromium" name="raspberry-vanilla/android_external_libyuv_chromium" remote="github" revision="android-15.0" />
<!-- FFmpeg --> <!-- FFmpeg -->
<remove-project name="platform/external/libdav1d" /> <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" 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-14.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-14.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-14.0" /> <project path="external/libudev-zero" name="raspberry-vanilla/android_external_libudev-zero" remote="github" revision="android-15.0" />
<!-- Graphics --> <!-- Graphics -->
<remove-project name="platform/external/drm_hwcomposer" /> <remove-project name="platform/external/drm_hwcomposer" />
<remove-project name="platform/external/libdrm" /> <remove-project name="platform/external/libdrm" />
<remove-project name="platform/external/mesa3d" /> <remove-project name="platform/external/mesa3d" />
<remove-project name="platform/external/minigbm" /> <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/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-14.0" /> <project path="external/libdrm" name="raspberry-vanilla/android_external_libdrm" remote="github" revision="android-15.0" />
<project path="external/mesa3d" name="raspberry-vanilla/android_external_mesa3d" remote="github" revision="android-14.0" /> <project path="external/mesa3d" name="raspberry-vanilla/android_external_mesa3d" remote="github" revision="android-15.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-15.0" />
<!-- v4l2_codec2 --> <!-- v4l2_codec2 -->
<remove-project name="platform/external/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-15.0" />
<!-- Wifi --> <!-- Wifi -->
<remove-project name="platform/external/wpa_supplicant_8" /> <remove-project name="platform/external/wpa_supplicant_8" />
<remove-project name="platform/packages/modules/Wifi" /> <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="external/wpa_supplicant_8" name="raspberry-vanilla/android_external_wpa_supplicant_8" remote="github" revision="android-15.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-15.0" />
</manifest> </manifest>

4
manifest_utilities.xml
View File

@@ -3,7 +3,7 @@
<remote name="github" fetch="https://github.com/" /> <remote name="github" fetch="https://github.com/" />
<!-- Utilities --> <!-- Utilities -->
<project path="external/raspberrypi-utils" name="raspberry-vanilla/android_external_raspberrypi-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-14.0" /> <project path="external/v4l-utils" name="raspberry-vanilla/android_external_v4l-utils" remote="github" revision="android-15.0" />
</manifest> </manifest>

27
remove_projects.xml
View File

@@ -2,23 +2,28 @@
<manifest> <manifest>
<remove-project name="device/google/akita" /> <remove-project name="device/google/akita" />
<remove-project name="device/google/akita-sepolicy" /> <remove-project name="device/google/akita-sepolicy" />
<remove-project name="device/google/akita-kernel" /> <remove-project name="device/google/akita-kernels/5.15" />
<remove-project name="device/amlogic/yukawa" /> <remove-project name="device/amlogic/yukawa" />
<remove-project name="device/amlogic/yukawa-kernel" /> <remove-project name="device/amlogic/yukawa-kernel" />
<remove-project name="device/google/barbet" /> <remove-project name="device/google/barbet" />
<remove-project name="device/google/barbet-sepolicy" /> <remove-project name="device/google/barbet-sepolicy" />
<remove-project name="device/google/bluejay" /> <remove-project name="device/google/bluejay" />
<remove-project name="device/google/bluejay-sepolicy" /> <remove-project name="device/google/bluejay-sepolicy" />
<remove-project name="device/google/bluejay-kernel" /> <remove-project name="device/google/bluejay-kernels/5.10" />
<remove-project name="device/google/bramble" /> <remove-project name="device/google/caimito" />
<remove-project name="device/google/bramble-sepolicy" /> <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/contexthub" />
<remove-project name="device/google/coral" /> <remove-project name="device/google/coral" />
<remove-project name="device/google/coral-kernel" /> <remove-project name="device/google/coral-kernel" />
<remove-project name="device/google/coral-sepolicy" /> <remove-project name="device/google/coral-sepolicy" />
<remove-project name="device/google/felix" /> <remove-project name="device/google/felix" />
<remove-project name="device/google/felix-sepolicy" /> <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" />
<remove-project name="device/google/gs101-sepolicy" /> <remove-project name="device/google/gs101-sepolicy" />
<remove-project name="device/google/gs201" /> <remove-project name="device/google/gs201" />
@@ -26,12 +31,12 @@
<remove-project name="device/google/gs-common" /> <remove-project name="device/google/gs-common" />
<remove-project name="device/google/lynx" /> <remove-project name="device/google/lynx" />
<remove-project name="device/google/lynx-sepolicy" /> <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" />
<remove-project name="device/google/pantah-sepolicy" /> <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" />
<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" />
<remove-project name="device/google/redbull-kernel" /> <remove-project name="device/google/redbull-kernel" />
<remove-project name="device/google/redbull-sepolicy" /> <remove-project name="device/google/redbull-sepolicy" />
@@ -39,16 +44,18 @@
<remove-project name="device/google/redfin-sepolicy" /> <remove-project name="device/google/redfin-sepolicy" />
<remove-project name="device/google/tangorpro" /> <remove-project name="device/google/tangorpro" />
<remove-project name="device/google/tangorpro-sepolicy" /> <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" />
<remove-project name="device/google/shusky-sepolicy" /> <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" />
<remove-project name="device/google/sunfish-kernel" /> <remove-project name="device/google/sunfish-kernel" />
<remove-project name="device/google/sunfish-sepolicy" /> <remove-project name="device/google/sunfish-sepolicy" />
<remove-project name="device/google/trout" /> <remove-project name="device/google/trout" />
<remove-project name="device/google/zuma" /> <remove-project name="device/google/zuma" />
<remove-project name="device/google/zuma-sepolicy" /> <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" />
<remove-project name="device/linaro/dragonboard-kernel" /> <remove-project name="device/linaro/dragonboard-kernel" />
<remove-project name="device/linaro/hikey" /> <remove-project name="device/linaro/hikey" />