From d9e7152aa69866aaa326cf04fa8247f6b8a0d064 Mon Sep 17 00:00:00 2001 From: Daniel Jacob Chittoor Date: Mon, 14 Apr 2025 11:01:20 +0530 Subject: [PATCH] src: Add supporting patches for prebuilt vendor --- ...asetools-support-prebuilt-vendor.img.patch | 11 ++++---- ...s-Copy-over-missing-images-to-IMAGES.patch | 26 +++++++++++++++++++ src/build.sh | 1 + 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 src/0002-releasetools-Copy-over-missing-images-to-IMAGES.patch diff --git a/src/0001-releasetools-support-prebuilt-vendor.img.patch b/src/0001-releasetools-support-prebuilt-vendor.img.patch index 69c9bca..71123f7 100644 --- a/src/0001-releasetools-support-prebuilt-vendor.img.patch +++ b/src/0001-releasetools-support-prebuilt-vendor.img.patch @@ -1,7 +1,7 @@ -From de5ab99ed0765ee45e97e13d5ef952d4166112c6 Mon Sep 17 00:00:00 2001 +From 78c4db40162abbb645b2794fadda796e308a2633 Mon Sep 17 00:00:00 2001 From: Erfan Abdi Date: Sat, 20 Jan 2024 04:20:43 +0330 -Subject: [PATCH] releasetools: support prebuilt vendor.img +Subject: [PATCH 1/2] releasetools: support prebuilt vendor.img Signing builds with prebuilt vendor.img causes the following error: @@ -23,15 +23,16 @@ This patch addresses this error by copying IMAGES/vendor.img if it exists in the Test: Follow https://source.android.com/devices/tech/ota/sign_builds#release-keys and then https: //source.android.com/devices/tech/ota/sign_builds#creating-image-files Change-Id: I903ff20d79bcf7621ebf29f0b8dfe85ebc3fb1ff +Signed-off-by: Daniel Jacob Chittoor --- tools/releasetools/sign_target_files_apks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py -index 089d8f7455..39ffc12a61 100755 +index 4eb73dc9d1..9cdb90b142 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py -@@ -534,7 +534,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info, +@@ -458,7 +458,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info, for info in input_tf_zip.infolist(): filename = info.filename @@ -41,5 +42,5 @@ index 089d8f7455..39ffc12a61 100755 # Skip OTA-specific images (e.g. split super images), which will be -- -2.34.1 +2.48.1 diff --git a/src/0002-releasetools-Copy-over-missing-images-to-IMAGES.patch b/src/0002-releasetools-Copy-over-missing-images-to-IMAGES.patch new file mode 100644 index 0000000..e9c2435 --- /dev/null +++ b/src/0002-releasetools-Copy-over-missing-images-to-IMAGES.patch @@ -0,0 +1,26 @@ +From 650a493360fd6365d3a20303c203df647bd57de4 Mon Sep 17 00:00:00 2001 +From: Daniel Jacob Chittoor +Date: Mon, 14 Apr 2025 10:27:56 +0530 +Subject: [PATCH 2/2] releasetools: Copy over missing images to "IMAGES/" + +Signed-off-by: Daniel Jacob Chittoor +--- + tools/releasetools/sign_target_files_apks.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py +index 9cdb90b142..a2bc07753e 100755 +--- a/tools/releasetools/sign_target_files_apks.py ++++ b/tools/releasetools/sign_target_files_apks.py +@@ -1332,7 +1332,7 @@ def main(argv): + common.ZipClose(output_zip) + + # Skip building userdata.img and cache.img when signing the target files. +- new_args = ["--is_signing"] ++ new_args = ["--is_signing", "--add_missing", "--verbose"] + # add_img_to_target_files builds the system image from scratch, so the + # recovery patch is guaranteed to be regenerated there. + if OPTIONS.rebuild_recovery: +-- +2.48.1 + diff --git a/src/build.sh b/src/build.sh index c5157a7..0861650 100755 --- a/src/build.sh +++ b/src/build.sh @@ -394,6 +394,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then echo ">> [$(date)] Applying patch for prebuilt vendor device" cd build/make git am /root/0001-releasetools-support-prebuilt-vendor.img.patch + git am /root/0002-releasetools-Copy-over-missing-images-to-IMAGES.patch cd ../../ fi -- GitLab