Commit Graph

73755 Commits

Author SHA1 Message Date
Treehugger Robot
4817ded07b Merge changes Ia2ec1b81,Ibc831ae8 am: 49380ebecf am: 5955f8a521
Original change: https://android-review.googlesource.com/c/platform/build/+/1941454

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

Change-Id: I596d2bfe32bbb85091f39b2a11068e27734ed9ad
2022-01-12 00:59:58 +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
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
ff5f9c27aa Merge "Remove win_sdk" am: d6bdfb3993 am: 9bc76efb0c
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: Id7a09731d90cae8869ea29327887cd650a086b07
2022-01-11 23:07:48 +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
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
50c9214e69 Merge "Make com.android.sepolicy mandatory" am: 7297032a8d am: 316b3b71e0
Original change: https://android-review.googlesource.com/c/platform/build/+/1924017

Change-Id: I34231dc679c64ec6e59b4852a25b8ab29616d313
2022-01-11 14:48:11 +00: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
d31e97cc6d Merge "Fix init_boot partition AVB signing" am: 27a309f627 am: 85128a7fa0
Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I4330eb68f30d31fa74c4e0f9bf980d1768776928
2022-01-11 07:37:07 +00: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
27a309f627 Merge "Fix init_boot partition AVB signing" 2022-01-11 06:59:47 +00:00
Treehugger Robot
9212d765d1 Merge "Do not append .meta_lic to meta_lic" am: 9d83209f12 am: 0f12de8954
Original change: https://android-review.googlesource.com/c/platform/build/+/1944764

Change-Id: I6e619d6c4a563d3294cd0fb7431b9d5bbbb2f799
2022-01-11 06:43:24 +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
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
8b1e80dae2 Merge "Embed host liblz4.so in target_files" am: 21e7285926 am: e3b9f4919e
Original change: https://android-review.googlesource.com/c/platform/build/+/1940645

Change-Id: Iaf86bc2d3d7b8fe1225ddecec681d036f61af73f
2022-01-10 23:07:49 +00:00
Pirama Arumuga Nainar
ad47bd9907 Merge "Set a BIONIC_COVERAGE .mk variable" am: bd7e1a38ba am: 8fdd8e7553
Original change: https://android-review.googlesource.com/c/platform/build/+/1918952

Change-Id: I4735b3327aa5b66b19b1065506e0a83350f62f11
2022-01-10 23:07:31 +00: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
Pirama Arumuga Nainar
8fdd8e7553 Merge "Set a BIONIC_COVERAGE .mk variable" am: bd7e1a38ba
Original change: https://android-review.googlesource.com/c/platform/build/+/1918952

Change-Id: I693064e34cb881687478d1106d9236299ba6f917
2022-01-10 22:54:34 +00:00
Treehugger Robot
21e7285926 Merge "Embed host liblz4.so in target_files" 2022-01-10 22:50:51 +00:00
Pirama Arumuga Nainar
bd7e1a38ba Merge "Set a BIONIC_COVERAGE .mk variable" 2022-01-10 22:36:57 +00:00
Victor Hsieh
829fe6d623 Merge "Add min_sdk_version to BuildManifest.apk" am: 70ca7c6add am: 30afe79e30
Original change: https://android-review.googlesource.com/c/platform/build/+/1941946

Change-Id: I2e90e96f229e3570d2d0b41da5f71951eef3550f
2022-01-10 20:39:13 +00:00
Victor Hsieh
30afe79e30 Merge "Add min_sdk_version to BuildManifest.apk" am: 70ca7c6add
Original change: https://android-review.googlesource.com/c/platform/build/+/1941946

Change-Id: I7013798ad7c29443eb7c93e6612b157179d78de2
2022-01-10 20:23:42 +00:00
Kelvin Zhang
6877e81467 Embed host liblz4.so in target_files
This file will be used by OTA generator to compress generated patches.
We need the host copy of LZ4 to ensure that compressed bytes matches
what the device would get if the compression were to be done on device.
For more details see go/lz4diff

Bug: 206729162
Test: m dist

Change-Id: I9c4ab772b001bf47da75cb87b028a1f27e2321a8
2022-01-10 12:12:21 -08:00
Victor Hsieh
70ca7c6add Merge "Add min_sdk_version to BuildManifest.apk" 2022-01-10 19:59:53 +00:00
Jiyong Park
efbb6ffa00 Add min_sdk_version to BuildManifest.apk
sign_target_files_apks demands it.

Bug: 213823227
Test: run com.google.android.tradefed.ota.SigningToolTest#Testcase1_Signingtest
Change-Id: I1bba2b25a71449a57d284024e77fb76d1b79a0ee
2022-01-10 20:14:05 +09:00
Jeff Vander Stoep
fe91d896ee Make com.android.sepolicy mandatory
Bug: 199914227
Test: aosp/1910032
Change-Id: I23599517b427363e758e6f06763079cc1482cb47
Merged-In: I23599517b427363e758e6f06763079cc1482cb47
2022-01-10 10:28:39 +00:00
Treehugger Robot
6d3d669a7c Merge "Add sepolicy compat versions to soong config" am: 664dd48176 am: 96d7aa5d1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1940869

Change-Id: I649c2c69974fd2866c19833afc4f2d532165d106
2022-01-10 02:45:02 +00:00
Treehugger Robot
96d7aa5d1c Merge "Add sepolicy compat versions to soong config" am: 664dd48176
Original change: https://android-review.googlesource.com/c/platform/build/+/1940869

Change-Id: I377b420689133c0c56309f647af89ac59522f5d4
2022-01-10 02:30:03 +00:00
Treehugger Robot
664dd48176 Merge "Add sepolicy compat versions to soong config" 2022-01-10 02:09:22 +00:00
Treehugger Robot
cd9f83eeb8 Merge "Add option to enable zucchini" am: dcd7e283d2 am: 3468085607
Original change: https://android-review.googlesource.com/c/platform/build/+/1939053

Change-Id: I2e28bf7f2c620a6be766b92a9e4b38d33658bedc
2022-01-09 21:11:12 +00:00
Treehugger Robot
3468085607 Merge "Add option to enable zucchini" am: dcd7e283d2
Original change: https://android-review.googlesource.com/c/platform/build/+/1939053

Change-Id: I1398da13f048093e8658baa5f3a16fc19a05a46d
2022-01-09 20:53:51 +00:00
Treehugger Robot
dcd7e283d2 Merge "Add option to enable zucchini" 2022-01-09 20:38:18 +00:00
Martin Stjernholm
a6e2ff4804 Merge "Add an option to specify the path to aapt2." am: 76537be0a9 am: 96cea0f44b
Original change: https://android-review.googlesource.com/c/platform/build/+/1938648

Change-Id: I84e92b88bee8d474f2df015910795243298953be
2022-01-09 19:56:01 +00:00
Martin Stjernholm
96cea0f44b Merge "Add an option to specify the path to aapt2." am: 76537be0a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1938648

Change-Id: I8534ab25066bd863b3d64330da2d0a3aae835019
2022-01-09 19:35:19 +00:00
Martin Stjernholm
76537be0a9 Merge "Add an option to specify the path to aapt2." 2022-01-09 19:11:49 +00:00
Yi-Yo Chiang
33f973fd2a Fix init_boot partition AVB signing
Typo: 'BOARD_AVB_INIT_BOOT_IMAGE_KEY_PATH' ->
  'BOARD_AVB_INIT_BOOT_KEY_PATH'

Record avb_init_boot_* arguments to misc_info.txt

Add INIT_BOOT_SECURITY_PATCH to support per-partition SPL.

Bug: 203698939
Test: avbtool info_image --image init_boot.img
Change-Id: I63e082b1dd675138a6ab5cceb8814b3673d26b13
2022-01-09 16:28:25 +08:00
Treehugger Robot
d75823a4bf Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I4a164373f540863d6f7062347e9eb90261659202
2022-01-08 18:54:23 +00:00
Treehugger Robot
4f8d04b603 Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I38c3f73271a7b2daa9ab4fe877c5bf39933fd5f8
2022-01-08 18:37:28 +00:00
Treehugger Robot
6a95477b0f Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" 2022-01-08 18:20:12 +00:00
Yi-Yo Chiang
8193900f87 Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))
Else the branch condition would always evaluate to true, making the
other branch useless and wrong!

Bug: 211741246
Test: m dist
Change-Id: I4791712632cbe0d5a9e20962c8425dd20bbe0bfd
2022-01-08 15:59:02 +00:00
Treehugger Robot
5c8ad6415b Merge "Write signature size even when it's empty" am: 555c3a7dc7 am: 77f7f00e3d
Original change: https://android-review.googlesource.com/c/platform/build/+/1938523

Change-Id: Iba8bebb734f888f98803ebfd6433577b9fa6ebf4
2022-01-08 02:47:01 +00:00