tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
79196 commits 1 branch 0 tags 119 MiB
Commit graph

2676 commits

Author SHA1 Message Date
Hongguang Chen
acf1b3afe2 Support chained init_boot partition signing 
Bug: 256048561
Bug: 256237041
Test: sign_target_files_apks -d certs --avb_init_boot_algorithm \
        SHA256_RSA4096 --avb_init_boot_key init_boot_rsa4096.pem \
	xxx.zip signed.zip (Check signed.zip/META/misc_info.txt)
Change-Id: I65fc7913089ae318d90df55a533d3e2ebd93b029
(cherry picked from commit 0d6b727e03)
Merged-In: I65fc7913089ae318d90df55a533d3e2ebd93b029
 2022-11-08 04:26:24 +00:00
Kelvin Zhang
25d69c8bf5 Temporary hack for making T->S downgrade work 
Downgrade OTA was broken because generic_ramdisk was removed from boot
partition in android T. Neither does O6 have init_boot. O6 also doesn't
include generic ramdisk in vendor boot, so no way for otatools to locate
contents of generic ramdisk. As a hack, omit boot partition timestamp if
we can't find ramdisk.

Test: generate T->S downgrade OTA for O6
Bug: 231656318
Merged-In: I9f5359462332aadadc324348873a3a4b2b126068
Change-Id: I9f5359462332aadadc324348873a3a4b2b126068
 2022-05-10 05:06:47 +00:00
Kelvin Zhang
f4406ca129 Merge identical key/val pairs in dynamic partition info 
We might add new values to dynamic_partition_info.txt, so some kind of
generic fallback mechanism is needed. If keys are different, we need to
decided on a case-by-case basis which side takes precedence. For
example, Virtual AB requires vendor support, so vendor side takes
precedence. VABC on T+ devices are implemented entirely in system, so
system/framework side takes precedence.

Bug: 230876542
Test: th
Change-Id: I67747368547d3ef3e29ad64f8f818ef4c5896246
(cherry picked from commit 6a683ce02b)
Merged-In: I67747368547d3ef3e29ad64f8f818ef4c5896246
 2022-05-06 21:40:14 +00:00
Iavor-Valentin Iftime
42a7160300 Merge "Rebuild and copy recovery and boot img when using vendor_otatools" am: 71585eae2b am: 7ee275cb81 am: 9fd594c53c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2068347

Change-Id: Id6c31fc941b14f5349b3b43f314c1a97872a4b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 17:06:22 +00:00
Iavor-Valentin Iftime
71585eae2b Merge "Rebuild and copy recovery and boot img when using vendor_otatools" 2022-04-21 16:07:12 +00:00
Lucas Wei
035fdee0ef Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" am: 2d5ecef1b3 am: bd66e32393 am: b8b3c0d0ab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2064760

Change-Id: Ibcf742f858c37141ab59cbd2d9c589ae15cf6ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 04:48:40 +00:00
Lucas Wei
2d5ecef1b3 Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" 2022-04-21 03:07:15 +00:00
Lucas Wei
03230250a3 vendor_kernel_boot: Update releasetools for vendor_kernel_boot 
add_img_to_target_files.py will re-make image and build a new
signed vbmeta.img with new images in target-file.
We need to add vendor_kernel_boot into AVB signing list and make it
support that image.

Test: make dist -j110 and check vbmeta.img
Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: Id07433f3dc33f95e2edd49de890f1e098cb9ef31
 2022-04-21 00:27:27 +08:00
Treehugger Robot
7ec455ad93 Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113 am: fa33ae6ff8 am: 1a73e98758 
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761

Change-Id: I1e8ff054b8a9946bacf605f7565bbbc7941badeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 06:03:43 +00:00
Iavor-Valentin Iftime
40adb17a1c Rebuild and copy recovery and boot img when using vendor_otatools 
Rebuild recovery and boot images with vbmeta footers and copy together with recovery patch/install files when building vendor images using vendor otatools. Fixes validate_target_files failure.

Bug: 220126689
Bug: 186097910

Test: sign_target_files_apks \
        --vendor_otatools=otatools_vendor_dir \
	--vendor_partitions=vendor,odm \
	merged-target_files.zip \
	signed-target_files.zip
Test: validate_target_files signed-target_files.zip

Change-Id: Id45c67405bc37b769757db1701507f82cc6068d3
 2022-04-19 18:35:36 +00:00
Bowgo Tsai
85578e0a9d Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK 
GKI targets, e.g., `gki_arm64` or `gki_x86_64` have only
boot-*.img files without a ramdisk. It has no other images,
e.g., init_boot.img, system.img, etc.

The current build system assumes that the ramdisk is either
in a boot.img or in a init_boot.img, which is not true for
those GKI targets. Adding a new flag to support building
boot-*.img without a ramdisk while not building an init_boot.img.

Bug: 220834917
Test: build and `unpack_bootimg`
Change-Id: I789343c3e3d9ff0c36c0e19680a9792bd31a1c9f
 2022-04-19 17:57:51 +08:00
Treehugger Robot
f1efdd1877 Merge "Add build flags for legacy EROFS support." am: 80d2c8f7a7 am: 05c690dd2e am: 2d16d3be49 
Original change: https://android-review.googlesource.com/c/platform/build/+/2009556

Change-Id: Iffa5eaf98453601e7edf7f012c28bcb1438193f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-16 06:15:22 +00:00
Treehugger Robot
80d2c8f7a7 Merge "Add build flags for legacy EROFS support." 2022-04-16 05:10:04 +00:00
Melisa Carranza Zúñiga
93fa6589df Merge "Revert "Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9 am: 5a0d81a0be am: 54e08307dc"" into tm-dev 2022-04-13 20:36:42 +00:00
Melisa Carranza Zúñiga
61e1dd0da5 Revert "Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9 am: 5a0d81a0be am: 54e08307dc" 
This reverts commit 8fe9e3a2c7.

Reason for revert: Updateable SEPolicy is punted.

Change-Id: I28ae2afbb1083e215f4e0a27a9164133cd73dd76
 2022-04-13 16:23:45 +00:00
Melisa Carranza Zúñiga
ef72d2822e Merge "Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0 am: bd8c313275 am: a2db49becd"" into tm-dev 2022-04-13 13:51:51 +00:00
Melisa Carranza Zúñiga
69e6d82106 Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0 am: bd8c313275 am: a2db49becd" 
This reverts commit 6e6c22c70e.

Reason for revert: Updateable SEPolicy is punted.

Change-Id: I99524d13811028a4036aa85c74cf10974fe08165
 2022-04-12 23:22:11 +00:00
Treehugger Robot
22eb25791a Merge "Revert "Rename init_boot properties to ro.init_boot.*"" am: 477b8e0561 am: 5e294a92bf am: 7895babcad 
Original change: https://android-review.googlesource.com/c/platform/build/+/2039666

Change-Id: Ife828081d6040819614cd26a83a20cccbf709a2a
 2022-03-24 05:02:38 +00:00
Treehugger Robot
477b8e0561 Merge "Revert "Rename init_boot properties to ro.init_boot.*"" 2022-03-23 23:27:02 +00:00
Kelvin Zhang
8250d2cd9e Revert "Rename init_boot properties to ro.init_boot.*" 
This reverts commit 411fac84d6.

Reason for revert: b/226318737

Change-Id: Ie1cf0e79b3ac11b91e031a479898a54856020500
 2022-03-23 19:46:09 +00:00
Melisa Carranza Zúñiga
6e6c22c70e Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0 am: bd8c313275 am: a2db49becd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2028269

Change-Id: Id27f7043ca2122cf43adf59e48843ffe5a445359
 2022-03-22 18:46:25 +00:00
Treehugger Robot
7ecab5ff11 Merge "Rebuild and copy recovery patch files when using vendor_otatools" am: 93d7c150c9 am: c4a7031063 am: 07326c0417 
Original change: https://android-review.googlesource.com/c/platform/build/+/2036543

Change-Id: Ic5871105c9867d22ee3666e6be02c523c6c5b493
 2022-03-22 18:05:26 +00:00
Melisa Carranza Zúñiga
fb042449e0 Merge "Adding sepolicy sign params to sign_target_files_apks." 2022-03-22 18:00:43 +00:00
Lucas Wei
e39d6af2de Merge "Make build support vendor_kernel_boot image" am: 8842016b30 am: 2dc9c52861 am: 3afd8feae8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2018599

Change-Id: I6fa0c4681ab6f974c97ac8112ad398de9f62d6a0
 2022-03-22 14:33:50 +00:00
Iavor-Valentin Iftime
246a5c069a Rebuild and copy recovery patch files when using vendor_otatools 
Rebuild recovery and copy recovery patch/install files when building vendor images using vendor otatools. Fixes ota_from_target_files failure.

Bug: 220126689
Bug: 186097910

Test: sign_target_files_apks \
        --vendor_otatools=otatools_vendor_dir \
	--vendor_partitions=vendor,odm \
	merged-target_files.zip \
	signed-target_files.zip

Change-Id: I4a415417e0d7b1bcd548292ec8f3a12570ec65f0
 2022-03-22 13:51:10 +00:00
Lucas Wei
8842016b30 Merge "Make build support vendor_kernel_boot image" 2022-03-22 13:48:34 +00:00
Yi-yo Chiang
f3309640bd Merge "Rename init_boot properties to ro.init_boot.*" am: e5ed34824f am: f773aa245f am: c69d4ddf3d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2026283

Change-Id: I256d377d8c18c557d9b6ecd4a484f2eaf8bca3ca
 2022-03-22 10:32:04 +00:00
Yi-yo Chiang
e5ed34824f Merge "Rename init_boot properties to ro.init_boot.*" 2022-03-22 09:13:32 +00:00
Melisa Carranza Zuniga
e6d4fb5ae6 Adding sepolicy sign params to sign_target_files_apks. 
Bug: b/217570541
Test: sign_target_files_apks --sepolicy_key=build/make/tools/releasetools/testdata/testkey_RSA4096.key
--sepolicy_cert=build/make/tools/releasetools/testdata/testkey.x509.pem target_files.zip target_out.zip
Change-Id: I4ae9f2a3297d10de68c6444dea1cd9996ad9dd11

Change-Id: I4a1ac7009ae0d6bb53c74bd34f8c74f12ea0a3b8
 2022-03-21 22:56:33 +00:00
Treehugger Robot
5444cac49a Merge "Copy vendor & odm .map files when using vendor_otatools" am: 6b3e5294db am: 32764d5b7e am: 0bd3600b17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2030363

Change-Id: I3f59d2477461f1027bedb44458b1510d39db1657
 2022-03-17 19:44:52 +00:00
Iavor-Valentin Iftime
880e4432b9 Copy vendor & odm .map files when using vendor_otatools 
Copy IMAGES/vendor.map and IMAGES/odm.map files when building vendor images
using vendor otatools. Fixes validate_target_files failure.

Bug: 220126689
Bug: 186097910

Test: sign_target_files_apks \
        --vendor_otatools=otatools_vendor_dir \
	--vendor_partitions=vendor,odm \
	merged-target_files.zip \
	signed-target_files.zip

Change-Id: Iaf904c90761b3830cf81af2561695c81bfc6c70d
 2022-03-17 14:02:30 +00:00
Lucas Wei
f57333f7fc Make build support vendor_kernel_boot image 
Add vendor_kernel_boot image for vendors whose bootloader support
extra first stage booting kernel modules ramdisks. This benefit
kernel repo to build kernel-artifacts only image without Andorid
artifacts dependency.

Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: If07218b86a7751b3d452a172610af960f5f9ec74
 2022-03-16 23:13:19 +08:00
Rob Seymour
5fe7080063 Merge "Update extract items call in merge_dexopt." am: 6ae6a3aef6 am: 5e9faa8c3d am: 1c59c596d2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2027303

Change-Id: I279bb5e4daaa95d4c2763f7f69ffb2f8675bb074
 2022-03-15 22:50:49 +00:00
Rob Seymour
c4e2754380 Update extract items call in merge_dexopt. 
Test: merge builds with VSDK image
Change-Id: I7788164ecbd69408d2293f49b98ab88db67e9cd9
 2022-03-15 17:43:51 +00:00
Yi-Yo Chiang
411fac84d6 Rename init_boot properties to ro.init_boot.* 
Right now they're named ro.bootimage.* which is really confusing.
Change it so that if generic ramdisk is in boot.img, then name the
properties as ro.bootimage.*, otherwise if generic ramdisk is in
init_boot.img, then name the prop as ro.init_boot.*.

Bug: 211823573
Test: m dist
Change-Id: Icff3c7be04b9a3c6490fbf49ba4f05565b029890
 2022-03-15 18:08:10 +08:00
Daniel Norman
b463d60c74 Merge changes from topic "mtf-cleanup-infer" am: d5d938742d am: ef8eb14d88 am: 59069f92c4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2006311

Change-Id: Ia64518fcbf7dddae2db6529231feb80082b000b6
 2022-03-14 22:12:02 +00:00
Treehugger Robot
2e011580a5 Merge "Moves merge scripts into a new merge folder." am: 51005914bd am: 0d0abf6cbc am: 567da60c58 
Original change: https://android-review.googlesource.com/c/platform/build/+/2006512

Change-Id: I4f787a582c506fadf683b99b73bc165194fb48b1
 2022-03-11 00:48:42 +00:00
Daniel Norman
5f47677f00 Infer merge configs if not provided. 
Bug: 221858722
Test: Create a merged package using inferred configs.
Test: atest --host releasetools_test
Change-Id: I93d67ca0f00be3f0e0424ed0a1e44c39ca2f3094
 2022-03-10 23:56:12 +00:00
Daniel Norman
2465fc8594 Split the huge merge_target_files script into multiple files. 
Bug: 221858722
Test: m otatools; Use to create merged builds
Test: atest --host releasetools_test
Change-Id: I5f932f160d3f6405b41a7721b1c75cc96749e77b
 2022-03-10 23:56:00 +00:00
Treehugger Robot
51005914bd Merge "Moves merge scripts into a new merge folder." 2022-03-10 23:39:28 +00:00
Treehugger Robot
6e2c7edf26 Merge "validate_target_files: support gki_arm64" am: e910accc38 am: d8bdea34e9 am: 0979185024 
Original change: https://android-review.googlesource.com/c/platform/build/+/2017679

Change-Id: I5f3c4ef7b9bcfc3e041088a013a696db216ef3b4
 2022-03-10 02:01:40 +00:00
Treehugger Robot
e910accc38 Merge "validate_target_files: support gki_arm64" 2022-03-10 00:57:10 +00:00
David Anderson
d15d508196 Merge "build_image: Remove mkerofsimage.sh." am: 060505fb4a am: c836e2e090 am: 0a132b5e2f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2008730

Change-Id: Ie7406b2257a96d04587b6117d038f058c76e785b
 2022-03-09 11:20:29 +00:00
Treehugger Robot
e2c184a169 Merge "Fix small typo in ota script options" am: 0cc4ae84ea am: 3874e5dae6 am: 9d1a765321 
Original change: https://android-review.googlesource.com/c/platform/build/+/2015628

Change-Id: Ied9c95eb0f92c0998ea9f3698834f510f546fe00
 2022-03-09 11:20:20 +00:00
Kelvin Zhang
597bb9e200 Merge "Simplify codes when _LoadOemDicts" am: ff35cbd110 am: f31a78141f am: 4c7d62c1d7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2015235

Change-Id: I878d646d0a857c5a2fb3c1ee3c2150b560290fb5
 2022-03-09 11:20:12 +00:00
Daniel Norman
b162119d37 Merge "Fix META/care_map.pb generation." am: 986582f262 am: 4bcec72be1 am: fd2e681400 
Original change: https://android-review.googlesource.com/c/platform/build/+/2008564

Change-Id: I13bcb357e4cb424a65d671f2f04a5e0c86b9c02c
 2022-03-09 11:20:03 +00:00
Bowgo Tsai
341fe02903 validate_target_files: support gki_arm64 
gki_arm64 is a special target to build multiple GKI boot-*.img
files. It has neither system.img nor vbmeta.img. Skips checking
system.img and vbmeta.img in this case.

Bug: 223078405
Test: validate_target_files signed-gki_arm64-target_files-8277156.zip
Change-Id: I9d3c102c11787cf70c1e1fc8e6a552f8fd19ff72
 2022-03-09 16:35:19 +08:00
David Anderson
060505fb4a Merge "build_image: Remove mkerofsimage.sh." 2022-03-09 04:04:05 +00:00
Treehugger Robot
0cc4ae84ea Merge "Fix small typo in ota script options" 2022-03-09 03:06:26 +00:00
Daniel Norman
2b0b9ca1b7 Moves merge scripts into a new merge folder. 
This will be used in the following change to split
merge_target_files into a collection of smaller
more-focused scripts.

Bug: 221858722
Test: m otatools; Use to create merged builds
Change-Id: Ie01dac81c5f9f28f1e0fe037259eabd2478e60b6
 2022-03-08 16:37:14 -08:00