StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,258 Commits 1 Branch 0 Tags
7ecab5ff11e29f1909c00dce8cfa93d56b67d7a6
Commit Graph

7684 Commits

Author SHA1 Message Date
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
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
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
Albert Wang
d86f28e72f Merge "Revert "Turn off adb on user builds."" am: 7be6751e00 am: 41eb7e3542 am: 7c15560cf8 
Original change: https://android-review.googlesource.com/c/platform/build/+/1913436

Change-Id: I4700011cbb09b2331ddc5fa8d6943a392d038f5e
 2022-03-16 04:05:07 +00:00
Albert Wang
7be6751e00 Merge "Revert "Turn off adb on user builds."" 2022-03-16 02:48:39 +00: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
Kelvin Zhang
ff35cbd110 Merge "Simplify codes when _LoadOemDicts" 2022-03-08 23:16:32 +00:00
Kelvin Zhang
318a464a71 Fix small typo in ota script options 
"enable_zucchin" was used instead of "enable_zucchini"

Test: th
Change-Id: Iaccb07bc6913a28c021fe84d3faeb59504ea1fbb
 2022-03-08 15:13:01 -08:00
Daniel Norman
986582f262 Merge "Fix META/care_map.pb generation." 2022-03-08 22:42:54 +00:00
Daniel Norman
799a18c82e Fix META/care_map.pb generation. 
In https://r.android.com/1991151 we removed an extra call to
AddCareMapForAbOta() from generate_care_map(), since
AddCareMapForAbOta() is already called by add_img_to_target_files.

However, when add_img_to_target_files generated care_map.pb it
didn't have the proper partition *_image_size values set for
images copied directly from the input target files packages.
This was because the generate_care_map() function, which sets
those *_image_size values, was executed after add_img_to_target_files.

At best this meant that care_map.pb was missing some information.
At worst, care_map.pb is missing entirely (when all images are
copied instead of regenerated).

This change:
- Renames generate_care_map() to set_copied_image_size_props()
  and simplifies the logic a bit.
- Calls set_copied_image_size_props() before calling
  add_img_to_target_files. Now, add_img_to_target_files will
  have all necessary *_image_size values to perform the
  META/care_map.pb generation step.

Bug: 187432243
Bug: 221858722
Bug: 223198503
Test: Use to create a merged build that does not regenerate any images.
      Observe that META/care_map.pb is now generated as expected.
Change-Id: I1b3c8636be8cbe203222e60b1272a5e11f68589b
 2022-03-08 19:02:51 +00:00
jiajia tang
c7c8697a62 Simplify codes when _LoadOemDicts 
Use function LoadDictionaryFromFile(), instead of
LoadDictionaryFromLines(). Makes codes conciser.

Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Change-Id: I15d6d4281a03be8a2f6f855054b1e4c1c3010fcd
 2022-03-08 18:27:24 +08:00
Treehugger Robot
dd465506c7 Merge "Add an option to set VABC compression algo" am: 966482dc56 am: 59c8ca8c63 am: 88aa664d13 
Original change: https://android-review.googlesource.com/c/platform/build/+/2006773

Change-Id: I2ba3292496306dafbc12cefbe9df910889fa5f74
 2022-03-05 00:58:34 +00:00
Treehugger Robot
8b1a6f6cab Merge "Allow vendor_otatools arg to be file or folder" am: a2d6ed53f0 am: 8414a9e9c0 am: 93f34b089e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2007451

Change-Id: I2a861f598876b652fb5b36a34b541c2e98d4152f
 2022-03-05 00:25:29 +00:00
Treehugger Robot
966482dc56 Merge "Add an option to set VABC compression algo" 2022-03-04 23:56:27 +00:00
Kelvin Zhang
84b3a28603 Add an option to set VABC compression algo 
When testing on cuttlefish, space consumption isn't a concern, so
compression can be disabled to save time. We also want to test the
non-compressed code path, as we expect some OEMs to use userspace COW
w/o compression.

If no --vabc_compression_param option specified to
ota_from_target_files, we will use the compression algo specified in
target_files's dynamic_partition_info.txt.

Bug: 219966986
Test: th
Change-Id: Ie18064b15938550ad6fb4efc86fc100c12321dc0
 2022-03-04 12:29:30 -08:00
David Anderson
94ad5bb5ef build_image: Remove mkerofsimage.sh. 
These wrapper scripts are difficult to maintain and there's not really
any value add. The argument strings don't match and every new build flag
has to be connected in an extra place.

Bug: 222715577
Test: make with EROFS enabled
Change-Id: Ie0e51cc30aa08b004d5d8345a2a2d885e193ffa9
 2022-03-04 11:07:43 -08:00
Iavor-Valentin Iftime
63cde0fd92 Allow vendor_otatools arg to be file or folder 
Required by signer script when using "--vendor_otatools" argument.

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: Iaa596f95f9db1e1e423b8306e9590fe27acb76e7
 2022-03-04 16:02:46 +00:00
Treehugger Robot
18a9f74bae Merge "Phony target to report all library names." am: f2a0110d36 am: 578d7b2492 am: 3248b76fa1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2002324

Change-Id: I803e67a57afde5fb3ceb6fd04f908caf0cfa165d
 2022-03-04 03:44:03 +00:00
Treehugger Robot
f2a0110d36 Merge "Phony target to report all library names." 2022-03-04 02:23:38 +00:00
Treehugger Robot
a9c76aba9f Merge "Allow missing key for misc_info lookups." am: 54188ba009 am: 39ec08569c am: c817796067 
Original change: https://android-review.googlesource.com/c/platform/build/+/2007930

Change-Id: I113922f56adf00dc49ef7f0399e416568d399722
 2022-03-04 01:01:26 +00:00
Daniel Norman
c44f964a5a Allow missing key for misc_info lookups. 
This broke the TV-VF build in ab/8246202.

Change-Id: Ifbf76a3c43c46fcd4280180e45ad23fcbed9346d
 2022-03-03 19:42:32 +00:00
Treehugger Robot
16992da933 Merge "Add SPL downgrade option help text" am: 0b6921be2b am: 075daf7363 am: 701b9ea802 
Original change: https://android-review.googlesource.com/c/platform/build/+/2005090

Change-Id: I86bdade3ca5ed88873c7bbf4870cb75f68bbd8c5
 2022-03-03 19:11:10 +00:00
Treehugger Robot
0b6921be2b Merge "Add SPL downgrade option help text" 2022-03-03 17:56:41 +00:00
Bob Badour
77570059cd Phony target to report all library names. 
Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m nothing reportallnoticelibrarynames

Change-Id: I0f791e2d92b8135d6af3a6c93f0db348fc69f5a1
 2022-03-02 22:32:37 -08:00
Treehugger Robot
1d737629d0 Merge "Clean up merge_target_files" am: 5b48aeccb2 am: 168ea6a2b9 am: 6fd34f2965 
Original change: https://android-review.googlesource.com/c/platform/build/+/2002319

Change-Id: Ieecc6bca70148a544ae77bf7c525a103d0581098
 2022-03-03 01:01:46 +00:00
Treehugger Robot
5b48aeccb2 Merge "Clean up merge_target_files" 2022-03-02 23:51:31 +00:00
Treehugger Robot
6756539e27 Merge "Fix releasetools OWNERS for merge." am: 92c59c42d3 am: 7f0a03e6cc am: 945140a4b4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2004390

Change-Id: Iacefea9a320c292c88c4357fa57343d7a533de82
 2022-03-02 02:14:29 +00:00