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

7701 commits

Author SHA1 Message Date
Yuntao Xu
69caac0966 Merge "Make file list by partitions for all lunch targets" am: 722d0a602a am: 990145b2ad am: 6a9f5909ca 
Original change: https://android-review.googlesource.com/c/platform/build/+/2034494

Change-Id: I9fc699864750a3b7c0893ffbb9315572a2bfc24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 17:08:51 +00:00
Yuntao Xu
722d0a602a Merge "Make file list by partitions for all lunch targets" 2022-04-08 15:29:15 +00:00
Yuntao Xu
c21dc3c8c1 Make file list by partitions for all lunch targets 
1. Filtered out the Android.mk file if the Make modules on them are
   not in the PRODUCT_PACKAGES or the correspoding deps;
2. Merged the Android.mk file list by partitions for all lunch targets.

Bug: 225256154
Test: lunch aosp_coral-eng; m
out/target/product/coral/mk2bp_remaining.html
Test: python3 build/make/tools/mk2bp_partition.py

Change-Id: I40919e81ab3c6bd516379f0acd72932e8db50088
 2022-04-07 11:01:19 -07:00
Orion Hodson
8208530fa6 Merge "Update checkowners.py to support python3" am: 2f4e021780 am: 982f400a15 am: 6542d0fcf5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2053986

Change-Id: Id917b37ad4d5aefcbc42baa2a9108a2d6899a0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:22:03 +00:00
Orion Hodson
2f4e021780 Merge "Update checkowners.py to support python3" 2022-04-05 08:22:38 +00:00
Treehugger Robot
10976c77b2 Merge "Remove regex functionality from rbcrun" am: bd78ed0726 am: 1b7d02336d am: 39a0861614 
Original change: https://android-review.googlesource.com/c/platform/build/+/2048503

Change-Id: I0013f0e3891f6082de46419f1893dd0da34055c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 21:35:20 +00:00
Orion Hodson
e421668192 Update checkowners.py to support python3 
Update generated with 2to3.

Bug: N/A
Test: manually check OWNERS files
Change-Id: Idccc7ba36351854fe2b7a669a99c97f3f3a03d0e
 2022-04-04 13:22:38 +01:00
Cole Faust
62878a2cef Remove regex functionality from rbcrun 
As a first step to making .rbc files compatible with bazel,
remove regex support since bazel doesn't have it.

Fixes: 227384703
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I8b946c20cc42897a47a5516a167732f4e16b6158
 2022-03-30 12:00:15 -07:00
Treehugger Robot
0e9fbfd393 Merge "Support OUT_DIR for license graph." am: bc8d61f17b am: 443a7b25e3 am: f74478b33b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2036930

Change-Id: I18d97926c690708b1c889d8e9cabe1ee97e15382
 2022-03-24 05:07:20 +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
bc8d61f17b Merge "Support OUT_DIR for license graph." 2022-03-24 00:43:58 +00:00
Treehugger Robot
477b8e0561 Merge "Revert "Rename init_boot properties to ro.init_boot.*"" 2022-03-23 23:27:02 +00:00
Bob Badour
c778e4cba4 Support OUT_DIR for license graph. 
Bug: 226066987

Test: OUT_DIR=/tmp/outdir m all listshare checkshare htmlnotice rtrace dumpgraph dumpresolutions compliancenotice_bom compliancenotice_shippedlibs
Test: OUT_DIR=/tmp/outdir m /tmp/outdir/target/product/bonito/obj/NOTICE.xml.gz
Test: m all listshare checkshare htmlnotice rtrace dumpgraph dumpresolutions compliancenotice_bom compliancenotice_shippedlibs
Test: m out/target/product/bonito/obj/NOTICE.xml.gz

Change-Id: I6282c647a389c5935d5ce7c79193f86d32c76365
 2022-03-23 14:12:12 -07: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
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