Commit Graph

73484 Commits

Author SHA1 Message Date
Yi-yo Chiang
2f2c110829 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" am: 4fe2a45dc7
Original change: https://android-review.googlesource.com/c/platform/build/+/1944700

Change-Id: Ibafe040b728b5d07ae58ae2019f306c39cd254c1
2022-01-17 05:45:46 +00:00
Yi-yo Chiang
4fe2a45dc7 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" 2022-01-17 05:29:40 +00:00
Yi-yo Chiang
b45caeb134 Merge changes from topic "gki-avb-vts" am: 8b4e2fd6c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1941496

Change-Id: I0de134d94db58229362d40d06e036195301f2d3f
2022-01-17 05:05:51 +00:00
Yi-yo Chiang
8b4e2fd6c0 Merge changes from topic "gki-avb-vts"
* changes:
  releasetools: Android T GKI certification scheme
  Android T GKI certification scheme
2022-01-17 04:52:28 +00:00
Treehugger Robot
0e00550664 Merge "Remove clatd" am: 3cf8f4b061
Original change: https://android-review.googlesource.com/c/platform/build/+/1948621

Change-Id: Iaefa538b6ea1a45afe5992c62064d8fd02b4cde1
2022-01-15 00:18:00 +00:00
Treehugger Robot
3cf8f4b061 Merge "Remove clatd" 2022-01-14 23:59:36 +00:00
Muhammad Haseeb Ahmad
2e44587697 Merge "Add PHONY target to make haiku-java target" am: d562eb5f1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1948125

Change-Id: I0f8457fea07aa0b2a263dc951be6fb733c0af973
2022-01-14 18:38:44 +00:00
Muhammad Haseeb Ahmad
d562eb5f1c Merge "Add PHONY target to make haiku-java target" 2022-01-14 18:13:12 +00:00
Nucca Chen
aa5fc6ecbd Remove clatd
clatd have been moved to apex module.

Test: TH

Change-Id: Ibcb32225098883b4098807da6468a539e1c41c0c
2022-01-14 14:02:05 +00:00
Yi-Yo Chiang
36054e2daf releasetools: Android T GKI certification scheme
Companion change of Iaf48a6e3d4b97fa6bfb5e1635a288b045baa248f
To support new GKI certification scheme for boot.img and
init_boot.img on upgrading and launching device combinations.

Bug: 210367929
Bug: 211741246
Bug: 203698939
Test: atest --host releasetools_test:test_common
Test: unpack_bootimg --boot_img boot.img
Test: unpack_bootimg --boot_img init_boot.img
Test: avbtool info_image --image out/boot_signature
Change-Id: I3749297c09c3899046550e4be776acbeea37ef2e
2022-01-14 19:50:32 +08:00
Treehugger Robot
3187ce1680 Merge "Add option to enable lz4diff" am: 2f1f985480
Original change: https://android-review.googlesource.com/c/platform/build/+/1944184

Change-Id: I5794c3a7b36e8ab9d013e22658db022ff5d78436
2022-01-13 20:38:12 +00:00
Treehugger Robot
636eac9642 Merge "Dump soong config variables in dump-variables-rbc" am: 9e81c44875
Original change: https://android-review.googlesource.com/c/platform/build/+/1948233

Change-Id: Ib326a389f4952dc1b0b19b674f8c99703dbea924
2022-01-13 20:37:59 +00:00
Treehugger Robot
2f1f985480 Merge "Add option to enable lz4diff" 2022-01-13 20:33:31 +00:00
Treehugger Robot
9e81c44875 Merge "Dump soong config variables in dump-variables-rbc" 2022-01-13 20:21:33 +00:00
Muhammad Haseeb Ahmad
cced136e8c Add PHONY target to make haiku-java target
This build creates artifacts for java fuzzers for Haiku.

Bug: 213225119
Test: build/soong/soong_ui.bash --make-mode -j86 haiku-java showcommands
dist DIST_DIR="."

Change-Id: I1ec16c39c3cd0ca008acc38bc51a3c3fa2ecdc9f
2022-01-13 19:53:40 +00:00
Cole Faust
c7226590e6 Dump soong config variables in dump-variables-rbc
There are some products whose board configurations
use soong_config_get to read the values of soong config
variables that were set in the product configuration.
These variables were being lost, as dump-variables-rbc
was skipping the soong config variables because mk2rbc
couldn't handle converting the raw SOONG_CONFIG_* variables.
To fix that issue, dump-variables-rbc now dumps them as
calls to soong_config_set instead.

Bug: 201700692
Test: m RBC_BOARD_CONFIG=1 nothing on certain products
Change-Id: I91ca8418635a94cf80362cad1729f48854f6bc98
2022-01-12 21:25:02 -08:00
Treehugger Robot
0f84df6a5e Merge "Generate .fsv_meta for more files" am: d36d4d8608
Original change: https://android-review.googlesource.com/c/platform/build/+/1941099

Change-Id: Ifd3b3caf6c25ebb62aff920da1ef480b6cca0e7c
2022-01-13 01:21:39 +00:00
Kelvin Zhang
f2728d615e Add option to enable lz4diff
When lz4diff is enabled, we inject the host copy of liblz4.so in
target_file to delta_generator. This is to ensure that host tooling can
produce same compressed output as the device.

Test: th
Bug: 206729162

Change-Id: I2d8206f7ec54fadedea16bf3d811b8353bc9414d
2022-01-12 17:21:00 -08:00
Treehugger Robot
d36d4d8608 Merge "Generate .fsv_meta for more files" 2022-01-13 01:06:01 +00:00
Treehugger Robot
192875fdfc Merge "Regression testcase for shipped vs nonshipped." am: 3a0656307c
Original change: https://android-review.googlesource.com/c/platform/build/+/1946016

Change-Id: I1e37a97e0600ee5155de3ca2b5a0bc8baa367bf6
2022-01-12 23:58:16 +00:00
Treehugger Robot
3a0656307c Merge "Regression testcase for shipped vs nonshipped." 2022-01-12 23:35:17 +00:00
Treehugger Robot
1dd148f737 Merge "Fix typo in doc: code segment for container dot" am: 710813e871
Original change: https://android-review.googlesource.com/c/platform/build/+/1946012

Change-Id: Ib88413400876e27177f087135045c0896191173e
2022-01-12 22:45:54 +00:00
Treehugger Robot
710813e871 Merge "Fix typo in doc: code segment for container dot" 2022-01-12 22:31:40 +00:00
Treehugger Robot
4a1fbf832d Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" am: 49c9d1867a
Original change: https://android-review.googlesource.com/c/platform/build/+/1941098

Change-Id: I824aa918ecb5d27f2d8ecff93cc4bc9f5c7701a5
2022-01-12 21:13:37 +00:00
Treehugger Robot
49c9d1867a Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" 2022-01-12 20:55:38 +00:00
Treehugger Robot
dd52cdce2e Merge "Updates OWNERS file" am: 35efbedb4f
Original change: https://android-review.googlesource.com/c/platform/build/+/1944687

Change-Id: I531cbf616de14aa699275db1097aa33c7d5afda9
2022-01-12 03:57:51 +00:00
Treehugger Robot
35efbedb4f Merge "Updates OWNERS file" 2022-01-12 03:37:34 +00:00
Treehugger Robot
5955f8a521 Merge changes Ia2ec1b81,Ibc831ae8 am: 49380ebecf
Original change: https://android-review.googlesource.com/c/platform/build/+/1941454

Change-Id: I30c59129aa0eb623657c752f6b25679ef6270603
2022-01-12 00:46:29 +00:00
Treehugger Robot
e27ecb85d4 Merge "Fold annotations." am: b3f3e7b3f7
Original change: https://android-review.googlesource.com/c/platform/build/+/1944765

Change-Id: I46f99a9ce4d198ea8a88bb86feff52b913761fa8
2022-01-12 00:46:15 +00:00
Bob Badour
00bf3d9b29 Regression testcase for shipped vs nonshipped.
Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m listshare; out/soong/host/linux-x86/bin/listshare ...
Test: m checkshare; out/soong/host/linux-x86/bin/checkshare ...
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I17221ec8fe429b5f745c0733f8bb1ab0ea2f4567
2022-01-11 16:38:55 -08:00
Treehugger Robot
49380ebecf Merge changes Ia2ec1b81,Ibc831ae8
* changes:
  Performance and scale.
  Use struct{}
2022-01-12 00:27:41 +00:00
Treehugger Robot
b3f3e7b3f7 Merge "Fold annotations." 2022-01-12 00:27:35 +00:00
Treehugger Robot
9bc76efb0c Merge "Remove win_sdk" am: d6bdfb3993
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: I0e251ec112696dbe5d040fd7c19d64d20b03ba51
2022-01-11 22:50:33 +00:00
Bob Badour
99dba55b4b Fix typo in doc: code segment for container dot
Test: not applicable
Change-Id: Ibaadc6e8fd4a267b50a46feb2dd6278ff1f5ace1
2022-01-11 14:46:22 -08:00
Treehugger Robot
d6bdfb3993 Merge "Remove win_sdk" 2022-01-11 22:25:02 +00:00
Bob Badour
103eb0f9bc Performance and scale.
Defer edge creation.

Don't create edges until the count is known to avoid repeated allocate+
copy operatios.

Limit resolutions.

Allow only a single resolution condition set per target, and overwrite
intermediate results. Reduces memory and obviates allocations.

Propagate fewer conditions.

Instead of propagating notice conditions to parents in graph during
initial resolve, leave them on leaf node, and attach to ancestors in
the final walk. Reduces copies.

Parallelize resolutions.

Use goroutines, mutexes, and waitgroups to resolve branches of the
graph in parallel. Makes better use of available cores.

Don't accumulate resolutions inside non-containers.

During the final resolution walk, only attach actions to ancestors from
the root down until the 1st non-aggregate. Prevents an explosion of
copies in the lower levels of the graph.

Drop origin for scale.

Tracking the origin of every potential origin for every restricted
condition does not scale. By dropping origin, propagating from top
to bottom can prune many redundant paths avoiding an exponential
explosion.

Conditions as bitmask.

Use bit masks for license conditions and condition sets. Reduces maps
and allocations.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m listshare; out/soong/host/linux-x86/bin/listshare ...
Test: m checkshare; out/soong/host/linux-x86/bin/checkshare ...
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: Ia2ec1b818de6122c239fbd0824754f1d65daffd3
2022-01-11 10:40:50 -08:00
Bob Badour
5446a6f8e1 Use struct{}
Using struct{}{} as the payload for set maps reduces memory use for
large sets.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m listshare; out/soong/host/linux-x86/bin/listshare ...
Test: m checkshare; out/soong/host/linux-x86/bin/checkshare ...
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: Ibc831ae80fc50f35e1000348fb28fc0167d0ebed
2022-01-11 10:40:50 -08:00
Bob Badour
67d8ae390a Fold annotations.
Use annotation slices looked up from map instead of read from disk to
reduce copies.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m listshare; out/soong/host/linux-x86/bin/listshare ...
Test: m checkshare; out/soong/host/linux-x86/bin/checkshare ...
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: Ibf6f7d319092e0d54ab451ffbbd35dcd7d0080e0
2022-01-11 10:40:39 -08:00
Cole Faust
fdc2cd300e Remove win_sdk
win_sdk is deprecated, if given on the command line
sdk will be build instead.

Bug: 212724080
Test: Presubmits
Change-Id: Ib3bd51923142b00100b49585ad88bc1292da2463
2022-01-11 10:31:11 -08:00
Treehugger Robot
316b3b71e0 Merge "Make com.android.sepolicy mandatory" am: 7297032a8d
Original change: https://android-review.googlesource.com/c/platform/build/+/1924017

Change-Id: I4844fba5449cd2801f052ee160c071250c209a0a
2022-01-11 14:31:00 +00:00
Treehugger Robot
7297032a8d Merge "Make com.android.sepolicy mandatory" 2022-01-11 14:11:37 +00:00
Yi-Yo Chiang
f282f5521d Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST
Right now if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST is given,
  $ m dist bootimage
would copy boot*.img to the dist dir.

After this change, both
  $ m dist  # droidcore
  $ m dist bootimage
would copy boot*.img to the dist dir, the difference is that the latter
builds & copies *only* the boot images.

Bug: 212486689
Test: m dist bootimage
Test: m dist => boot*.img are copied to dist dir
Change-Id: I1c714ce5d75eba93e32078b1ac291a181b05405a
2022-01-11 17:31:16 +08:00
Yi-yo Chiang
85128a7fa0 Merge "Fix init_boot partition AVB signing" am: 27a309f627
Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I1f05d1029f0dda093ae32cfe1f8bfe1cbe34e1d5
2022-01-11 07:19:05 +00:00
Yi-Yo Chiang
44fb3619d1 Android T GKI certification scheme
New scheme is to certify kernel & ramdisk image separately, and
effectively decouple kernel & user space ramdisk image.

Under the new scheme, the --os_version and --os_patch_level boot header
field must be empty in order to maintain consistency.
Instead, these values must be in the vbmeta hash descriptor and
GKI certificate.

The new scheme also validates the image metadata, including the security
patch level.

The 'generic_kernel' certificate is associated with the 'boot' partition
and 'generic_ramdisk' certificate with 'init_boot' partition.

The 'generic_ramdisk' certificate may be packed into the 'boot' image if
product configuration doesn't have 'init_boot' image, this is only for
testing purposes and would be removed eventually.

Bug: 210367929
Bug: 211741246
Bug: 203698939
Test: unpack_bootimg --boot_img boot.img
Test: unpack_bootimg --boot_img init_boot.img
Test: avbtool info_image --image out/boot_signature
Change-Id: Iaf48a6e3d4b97fa6bfb5e1635a288b045baa248f
2022-01-11 15:14:38 +08:00
Yi-yo Chiang
27a309f627 Merge "Fix init_boot partition AVB signing" 2022-01-11 06:59:47 +00:00
Treehugger Robot
0f12de8954 Merge "Do not append .meta_lic to meta_lic" am: 9d83209f12
Original change: https://android-review.googlesource.com/c/platform/build/+/1944764

Change-Id: I4d33690c7addc7cca8ff01772cab94a49d2d1e53
2022-01-11 06:29:04 +00:00
Treehugger Robot
9d83209f12 Merge "Do not append .meta_lic to meta_lic" 2022-01-11 06:11:14 +00:00
Bowgo Tsai
221628f342 Updates OWNERS file
gsi_keys.mk has been removed on commit
I3714de75b94be43a1364b89b92d893b336aa014b. Removing it from
the OWNERS file and adds developer_gsi_keys.mk.

Bug: 176869478
Test: presubmit
Change-Id: I2eeee65a244c4987f217f004ec47a0b6dca9b564
2022-01-11 11:13:25 +08:00
Bob Badour
63a281cc29 Do not append .meta_lic to meta_lic
Test: manual
Change-Id: I8d7162dc55f057d542faaa7feb546050d3a872e7
2022-01-10 18:00:03 -08:00
Treehugger Robot
e3b9f4919e Merge "Embed host liblz4.so in target_files" am: 21e7285926
Original change: https://android-review.googlesource.com/c/platform/build/+/1940645

Change-Id: I374aeeddd9741d6249e8c6786d3f30ea38d0ed30
2022-01-10 22:54:54 +00:00