Commit Graph

73484 Commits

Author SHA1 Message Date
Xin Li
f2cf79c417 [automerger skipped] Merge "Merge Android 12 QPR1" am: 46c84edacf -s ours
am skip reason: Merged-In Ib836574268ae722da7a06d53d2014daa5877a991 with SHA-1 c95816ce4b is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1921230

Change-Id: I033c137837187679c92fd34c99c7bad15cbf9be7
2021-12-14 21:00:14 +00:00
Xin Li
46c84edacf Merge "Merge Android 12 QPR1" 2021-12-14 20:26:44 +00:00
Xin Li
0a9962fd9e Merge Android 12 QPR1
Bug: 210511427
Merged-In: Ib836574268ae722da7a06d53d2014daa5877a991
Change-Id: Ic04e8e0274868bc7ccf3ac454ed0217beff382a0
2021-12-14 08:38:55 -08:00
Yi-yo Chiang
bd3a3bc919 Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" am: 90b0039a9d
Original change: https://android-review.googlesource.com/c/platform/build/+/1913441

Change-Id: Ic78b02164ab7d0f2fad87de4511496e2ee32025a
2021-12-14 11:56:43 +00:00
Yi-yo Chiang
90b0039a9d Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" 2021-12-14 11:39:03 +00:00
yangbill
6dd962fdda Preserve all COMPATIBILITY_SUITES values in module-info
Extend COMPATIBILITY_SUITES in module-info to avoid overwriting previous
values. In particular, this happens for the `host-unit-tests` suite
which is automatically added by Soong rules only to be clobbered by the
modules that have both device and host variants.

Bug: 209806322
Test: source build/envsetup.sh ; lunch aosp_cf_x86_64_phone ;
      m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I56a2d4c9786ed3da1e788ba211ec1bcaa6559549
2021-12-14 05:54:30 +00:00
Cole Faust
4db91af70c Create $(findstring) starlark implementation
Bug: 201700692
Test: go test in other cl in the topic
Change-Id: Ibe7d600c9fe5335a1277e1572aa52f6c512c2951
2021-12-13 16:35:54 -08:00
Inseob Kim
c95816ce4b Merge "Refactor sepolicy version related codes" am: e23891877c
Original change: https://android-review.googlesource.com/c/platform/build/+/1916858

Change-Id: Ib836574268ae722da7a06d53d2014daa5877a991
2021-12-13 04:13:32 +00:00
Inseob Kim
e23891877c Merge "Refactor sepolicy version related codes" 2021-12-13 03:57:36 +00:00
Treehugger Robot
49da1ac76c Merge "Revert^2 "Reuse license metadata files from Soong"" am: f13d0b2f22
Original change: https://android-review.googlesource.com/c/platform/build/+/1918950

Change-Id: I5b572989961bf849cedd2da802b72361ef5fd778
2021-12-11 03:48:24 +00:00
Treehugger Robot
f13d0b2f22 Merge "Revert^2 "Reuse license metadata files from Soong"" 2021-12-11 03:32:18 +00:00
Pirama Arumuga Nainar
b1b4e1e38b Set a BIONIC_COVERAGE .mk variable
Bug: http://b/194128476
Bug: http://b/210012154

Set BIONIC_COVERAGE to true if coverage instrumentation is enabled for
bionic/libc.  This is used in system/core/rootdir/Android.mk to set
the default LLVM_PROFILE_FILE environment.

Test: Run tests with this topic and verify coverage still works and also
test memory-mapped coverage (death tests, JNI code in CTS)

Change-Id: I585f3e43dfcb82dd3c211051d354dd79ee77b1fb
2021-12-10 15:29:37 -08:00
Colin Cross
2e075808dd Merge "Revert "Reuse license metadata files from Soong"" am: 91a9483e87
Original change: https://android-review.googlesource.com/c/platform/build/+/1918946

Change-Id: I85bbf851be4f5d2d3884f2c4652e32b0bcbd59b3
2021-12-10 23:20:49 +00:00
Colin Cross
71d9919322 Revert^2 "Reuse license metadata files from Soong"
81b167693f

Change-Id: Iff45cffb1f2b9d01cec70d96e34f46d35bb37842
2021-12-10 23:05:02 +00:00
Colin Cross
91a9483e87 Merge "Revert "Reuse license metadata files from Soong"" 2021-12-10 23:04:45 +00:00
Colin Cross
81b167693f Revert "Reuse license metadata files from Soong"
Revert "Escape Host*Variable contents"

Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: Id9d66c01453aebe8a52eaa6628e9933a990d4c2f
2021-12-10 23:03:08 +00:00
Cole Faust
98a7011088 Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: I37ee8f0df0bcb212e0fc3add6b069e5857614747
2021-12-10 22:05:31 +00:00
Colin Cross
b48261121e Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

Change-Id: Id5db06a34777ff0a2bca39ffa0e083ca2a131a3d
2021-12-10 22:04:39 +00:00
Cole Faust
01e022369b Merge "Strip ODM_MANIFEST_SKUS" 2021-12-10 22:02:22 +00:00
Colin Cross
6cf8ec77cc Merge "Reuse license metadata files from Soong" 2021-12-10 21:43:49 +00:00
Akilesh Kailash
7260b087ea Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I55d5d4da987da73432f31f68c135903f725fd6fd
2021-12-10 19:58:12 +00:00
Akilesh Kailash
3f5f0b306d Merge "Enable userspace snapshots for OTA" 2021-12-10 19:44:48 +00:00
Janis Danisevskis
f0335310f7 Update vndk list with dice hal libraries.
Bug: 198197213
Test: N/A
Change-Id: Ib199c5c18438b0d62ec5d6619ce9708c71ecac22
2021-12-10 09:35:16 -08:00
Inseob Kim
7c708e2d27 Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: I15f4771b72598028a380d15ca8f1c3421b07890d
2021-12-10 12:29:48 +00:00
Inseob Kim
f09eddd531 Merge "Add BoardPlatVendorPolicy to soong config" 2021-12-10 12:13:36 +00:00
Inseob Kim
51c455bdb2 Refactor sepolicy version related codes
1. Move BOARD_SEPOLICY_VERS to build/make/core/config.mk where
PLATFORM_SEPOLICY_VERSION is set.

2. Remove hard-coded versions for the treble tests.

Test: build
Change-Id: Iab338a1f16855205d62312d4247a15ea766be1fe
2021-12-10 18:36:18 +09:00
Cole Faust
3203cba181 Export words function
It will now be generated in mk2rbc as part of
foreach expressions.

Bug: 201700692
Test: None
Change-Id: I400563946d46d7cac9be901a80470248990800bd
2021-12-09 14:26:03 -08:00
Cole Faust
d4fcff6db8 Merge "Allow multiple patterns in rblf_wildcard" am: 598cbbcde7
Original change: https://android-review.googlesource.com/c/platform/build/+/1915258

Change-Id: Ib9da4c5eb2ea775fb52b67ee4a6558aee4f0e5dc
2021-12-09 21:50:21 +00:00
Cole Faust
598cbbcde7 Merge "Allow multiple patterns in rblf_wildcard" 2021-12-09 21:32:53 +00:00
Cole Faust
c8c516a89b Strip ODM_MANIFEST_SKUS
Otherwise it gets a different value when using starlark
board config, causing the ninja files to differ.

Bug: 201700692
Test: ./build/bazel/ci/rbc_regression_test.sh -b aosp_crosshatch_car-userdebug
Change-Id: I55870f031b779202db720f10d7d502f9d868e1f6
2021-12-09 10:30:19 -08:00
Yi-yo Chiang
608f4bf805 [automerger skipped] Merge "Roll-forward the VNDK snapshot list of GSI" am: f02c28d8ab -s ours
am skip reason: Merged-In Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22 with SHA-1 33fc244de5 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1913440

Change-Id: Id907c9a8e66ecffecb0fe044240e3d364c3876eb
2021-12-09 06:21:54 +00:00
Yi-Yo Chiang
8d96c7303c Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31
Bug: 209563751
Fixes: 209563751
Test: Presubmit
Change-Id: Ifcfe39c14a9459d75a5f8656820e1b20031ef3be
2021-12-09 06:00:07 +00:00
Yi-yo Chiang
f02c28d8ab Merge "Roll-forward the VNDK snapshot list of GSI" 2021-12-09 05:59:36 +00:00
Cole Faust
fdff6b1e9c Allow multiple patterns in rblf_wildcard
This is to match the functionality of make's $(wildcard)

Bug: 201700692
Test: go test
Change-Id: Ib20c4a4aa9642a2d76b5da5c7accd60e6b91c8fc
2021-12-08 17:52:40 -08:00
Treehugger Robot
48b1b7e6f0 Merge "Explicitly set EROFS compression parameter" am: 1f9408b2b2
Original change: https://android-review.googlesource.com/c/platform/build/+/1908390

Change-Id: I797ee4f2cf2bdc2b6f0e2107e28a57a4e6c99b10
2021-12-09 01:11:02 +00:00
Treehugger Robot
1f9408b2b2 Merge "Explicitly set EROFS compression parameter" 2021-12-09 00:40:36 +00:00
Treehugger Robot
ccfd736eda Merge "license metadata remove path on top-down walk" am: 159ae38aaa
Original change: https://android-review.googlesource.com/c/platform/build/+/1915582

Change-Id: I5d4af25da66c92813a13c0653c710d5adbc21109
2021-12-09 00:18:38 +00:00
Treehugger Robot
159ae38aaa Merge "license metadata remove path on top-down walk" 2021-12-08 23:55:26 +00:00
Treehugger Robot
1fb8dbd1c8 Merge "license metadata performance" am: d497acc1c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1914147

Change-Id: I253cfc5ff436b441c1abe35a6b3069d194bd7dbd
2021-12-08 23:01:12 +00:00
Dan Willemsen
b66a55ea05 Merge "Add basic Darwin+Arm64 support as HOST_CROSS" am: e808bc4a09
Original change: https://android-review.googlesource.com/c/platform/build/+/1883492

Change-Id: If566a5f3a588db74cc6d54d4c107c0f1c88bea4c
2021-12-08 22:59:34 +00:00
Treehugger Robot
d497acc1c9 Merge "license metadata performance" 2021-12-08 21:47:39 +00:00
Dan Willemsen
e808bc4a09 Merge "Add basic Darwin+Arm64 support as HOST_CROSS" 2021-12-08 21:08:43 +00:00
Bob Badour
b285515ca1 license metadata remove path on top-down walk
Performance optimization means not every path will be traversed.

Instead of updating parents via the path, perform a 2nd bottom-up walk
after the top-down walk to propagate the new resolutions to parents.

Note: the 2nd walk method will add resolutions to statically linked
libraries etc. at deeper levels, but those do not affect what gets
reported. In particular, note that test data for dumpresolutions
changes, but none of the test data for listshare, checkshare etc.
changes.

Test: m all systemlicense listshare checkshare dumpgraph dumpresolutions

Bug: 68860345
Bug: 151177513
Bug: 151953481
Change-Id: I76361c4e33bbadbbea38cbec260430e8f9407628
2021-12-08 12:52:59 -08:00
Dan Willemsen
8820840d57 Add basic Darwin+Arm64 support as HOST_CROSS
Soong will use this to turn on universal binary support (X86_64 + Arm64
in the same binary).

Bug: 203607969
Test: m sdk-repo-platform-tools sdk-repo-build-tools on Mac
Change-Id: I04612136a42e85f4add95202ce20e741d9aaa302
2021-12-08 09:26:27 -08:00
Inseob Kim
d0f600a074 Add BoardPlatVendorPolicy to soong config
Bug: 205924657
Test: build
Change-Id: I89697a82c6d288576ae066f82a067383ccd57e2e
2021-12-08 22:53:02 +09:00
Yi-Yo Chiang
392a0db18d Roll-forward the VNDK snapshot list of GSI
The latest stable SDK version is 31, so add 31 to the list of VNDK
snapshots.

Bug: 196806844
Test: Presubmit
Change-Id: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
Merged-In: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
(cherry picked from commit 33fc244de5)
2021-12-08 18:12:47 +08:00
Gabriel Biren
0a9a11da06 Add Wifi supplicant AIDL interface support.
Test: Manual test
Bug: 196235436
Change-Id: I9b096d4782715dc9229f7a9a4d3227f15c336d7a
2021-12-07 23:37:11 +00:00
Bob Badour
3a820dd5a0 license metadata performance
Tune the top-down walk to avoid needlessly walking the same subtree
over and over again with the same condition(s).

Takes walking system image down from 3m to 1.5s.

Test: m all systemlicense listshare checkshare dumpgraph dumpresolutions

Bug: 68860345
Bug: 151177513
Bug: 151953481

Change-Id: I4354800cd8dfc42efd4df274d2ce45eaa3e0a99f
2021-12-07 15:36:10 -08:00
Akilesh Kailash
bfdd246130 Enable userspace snapshots for OTA
Bug: 202784018

Test: Full/Incremental OTA tested on CF, Pixel

OTA Merge time performance on Pixel (bramble)

==========================================================

Incremental - OTA - 389M

OTA Operations:

system - Copy-ops: 34060 Zero-ops: 678 Replace-ops: 93846 Xor-ops: 75490

product - Copy-ops: 241742 Zero-ops: 1970 Replace-ops: 292890 Xor-ops: 80763

vendor - Copy-ops: 110285 Zero-ops: 660 Replace-ops: 62163 Xor-ops: 23474

system_ext_b - Copy-ops: 44509 Zero-ops: 426 Replace-ops: 39475 Xor-ops: 44628

====================================================================

1: VAB - Compression with dm-snapshot (on Android S)

Merge-time = 344 seconds (~5.7 minutes)

2: VAB - Compression with user-snapshot (on Android T)

Merge-time = 53 seconds

3: VAB - Without compression (using kernel COW format)

Merge-time = 33 seconds

Compared to Android S, merge time improves by 84% with user-snapshots on Android T.

The 20 seconds difference between (2) and (3) is because of two phase merge during compression which essentially serializes merge start time between partitions.

On (3), there is no two phase merge as all the partition starts merge at the same time.

When there is no two phase merge involved, (2) and (3) are nearly identical.

============================================================

Full OTA - 1.8G

1: VAB - Compression with dm-snapshot (on Android S)

Merge-time = 40 seconds

2: VAB - Compression with user-snapshot (on Android T)

Merge-time = 32 seconds

3: VAB - Without compression (using kernel COW format)

Merge-time = 32 seconds

===============================================================

Presubmit OTA testing enabled on Cuttlefish for ~1 Week with
the feature enabled.

https://v2-dot-atp.googleplex.com/tests/asit/ota/incremental_mixed_resume

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I88d15b94a48799996f38755063319269a3d70723
2021-12-07 20:38:29 +00:00
Treehugger Robot
37d01f684d Merge "Add missing apksigner dependency" am: 1295bc5138
Original change: https://android-review.googlesource.com/c/platform/build/+/1891388

Change-Id: Ie10a161857ad6ecd4d3d5f2cf5a43a5f2c7a0e00
2021-12-07 12:57:53 +00:00