Commit Graph

29493 Commits

Author SHA1 Message Date
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
Yi-yo Chiang
806d08f61d Merge changes from topic "no-more-boot-debug-gki-sc-v2-dev" into sc-v2-dev
* changes:
  Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI
  Refactor build logic of boot-debug & vendor_boot-debug
  Skip building boot-(test-harness|debug).img if not needed
2021-12-10 05:36:27 +00:00
Yi-yo Chiang
a03f18f45d Merge "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" into sc-v2-dev 2021-12-10 04:05:11 +00:00
Bassem Khalife
b9f40852e2 [DO NOT MERGE] am: fdbbcabca3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16433536

Change-Id: Iac3a6f6d17b0d41c5b91ffa96e5ee7898e4fb058
2021-12-09 23:47:07 +00: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
d58659eb13 Merge "Allow multiple patterns in rblf_wildcard" am: 598cbbcde7 am: d4fcff6db8 am: 815db5926e
Original change: https://android-review.googlesource.com/c/platform/build/+/1915258

Change-Id: I656b8b630b47293b6ec29f9df5bddbc2673d5377
2021-12-09 22:17:15 +00:00
Cole Faust
815db5926e Merge "Allow multiple patterns in rblf_wildcard" am: 598cbbcde7 am: d4fcff6db8
Original change: https://android-review.googlesource.com/c/platform/build/+/1915258

Change-Id: I68d901da39fdeb2cdacf9393dd0aae6fb909262c
2021-12-09 22:04:40 +00: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
Bassem Khalife
fdbbcabca3 [DO NOT MERGE]
Update Security String to 2022-02-05
   
 Bug: 210005927

Change-Id: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
2021-12-09 19:40:31 +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
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
e64c26e8d4 Merge "Explicitly set EROFS compression parameter" am: 1f9408b2b2 am: 48b1b7e6f0 am: 89bdc4cc04
Original change: https://android-review.googlesource.com/c/platform/build/+/1908390

Change-Id: I89f59dedb5d3682c3cc14d52976dae55d3f34329
2021-12-09 01:41:23 +00:00
Treehugger Robot
89bdc4cc04 Merge "Explicitly set EROFS compression parameter" am: 1f9408b2b2 am: 48b1b7e6f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1908390

Change-Id: Ibf9c407682c5911e133e8172f35648726da7f435
2021-12-09 01:26:40 +00: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
Dan Willemsen
c1c9031b41 Merge "Add basic Darwin+Arm64 support as HOST_CROSS" am: e808bc4a09 am: b66a55ea05 am: e0a90e10b3
Original change: https://android-review.googlesource.com/c/platform/build/+/1883492

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

Change-Id: If56481c18988d0e457b3479814b62ba4bc6e7fef
2021-12-08 23:18:52 +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
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
Treehugger Robot
2f958913d9 Merge "Add missing apksigner dependency" am: 1295bc5138 am: 37d01f684d am: e807b0639a
Original change: https://android-review.googlesource.com/c/platform/build/+/1891388

Change-Id: Icd45553cb33ae8b4568be15f74612bb6ac84d4c3
2021-12-07 13:34:53 +00:00
Treehugger Robot
e807b0639a Merge "Add missing apksigner dependency" am: 1295bc5138 am: 37d01f684d
Original change: https://android-review.googlesource.com/c/platform/build/+/1891388

Change-Id: Ic10a05e9d6004479c4c906c9d07a899754e682aa
2021-12-07 13:21:25 +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
Treehugger Robot
1295bc5138 Merge "Add missing apksigner dependency" 2021-12-07 11:43:06 +00:00
Treehugger Robot
86518a9506 Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" am: 0d8d378bd4 am: 793100509c am: 19acbbea9c
Original change: https://android-review.googlesource.com/c/platform/build/+/1910142

Change-Id: If3bd2e19f01279f92561f091d84bc8c217e9580d
2021-12-07 05:26:00 +00:00
Treehugger Robot
19acbbea9c Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" am: 0d8d378bd4 am: 793100509c
Original change: https://android-review.googlesource.com/c/platform/build/+/1910142

Change-Id: Icb4faefc4df0d311c41821e6742d04e76b44ee9f
2021-12-07 05:14:46 +00:00
Treehugger Robot
793100509c Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" am: 0d8d378bd4
Original change: https://android-review.googlesource.com/c/platform/build/+/1910142

Change-Id: I36aa20e6861144f547955e4750c43f1cd011ffeb
2021-12-07 04:52:20 +00:00
Treehugger Robot
0d8d378bd4 Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" 2021-12-07 04:33:01 +00:00
Treehugger Robot
715fb15bce Merge "[cc/sanitize] Re-enable new pass manager for fuzzer targets" am: e813a4a023 am: 9498b39594 am: 0caa8245fb
Original change: https://android-review.googlesource.com/c/platform/build/+/1908951

Change-Id: Ia8b49b7e941b1ed61781762683f76a51513d5cbe
2021-12-06 22:19:06 +00:00
Treehugger Robot
0caa8245fb Merge "[cc/sanitize] Re-enable new pass manager for fuzzer targets" am: e813a4a023 am: 9498b39594
Original change: https://android-review.googlesource.com/c/platform/build/+/1908951

Change-Id: I976e98dad4b31b96705d3bcf237a52bdc425206f
2021-12-06 22:06:28 +00:00
Treehugger Robot
9498b39594 Merge "[cc/sanitize] Re-enable new pass manager for fuzzer targets" am: e813a4a023
Original change: https://android-review.googlesource.com/c/platform/build/+/1908951

Change-Id: Ief74d2d1faf733bab6a86fed95cceea956c4ad03
2021-12-06 21:42:56 +00:00
Treehugger Robot
e813a4a023 Merge "[cc/sanitize] Re-enable new pass manager for fuzzer targets" 2021-12-06 21:40:10 +00:00
Cole Faust
e867718c2c Merge "Pass input variables to product config" am: 8fb2d83457 am: d8b85632e3 am: c9f7aa1c4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1908233

Change-Id: Idb066dfdad1199ef3d5605f991ca12b5859b7985
2021-12-05 04:49:47 +00:00
Cole Faust
c9f7aa1c4b Merge "Pass input variables to product config" am: 8fb2d83457 am: d8b85632e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1908233

Change-Id: Icc6546da1253859e2bb2e94657839a3002a654b0
2021-12-05 04:26:13 +00:00
Cole Faust
d8b85632e3 Merge "Pass input variables to product config" am: 8fb2d83457
Original change: https://android-review.googlesource.com/c/platform/build/+/1908233

Change-Id: I182cdec2014ebf8409ad192c1ffd82b2cda7cf5f
2021-12-05 04:05:50 +00:00
Cole Faust
8fb2d83457 Merge "Pass input variables to product config" 2021-12-05 03:43:24 +00:00
Treehugger Robot
3f05a15413 Merge "Add Soong variable for optimizing system Java" am: 742874e0e6 am: 7939f4bca2 am: 62bd62a46b
Original change: https://android-review.googlesource.com/c/platform/build/+/1896612

Change-Id: I999c85b5260b03e58e650e4490b1ad4092af994e
2021-12-04 01:58:03 +00:00
Treehugger Robot
62bd62a46b Merge "Add Soong variable for optimizing system Java" am: 742874e0e6 am: 7939f4bca2
Original change: https://android-review.googlesource.com/c/platform/build/+/1896612

Change-Id: If2c67695d83cb5cb6cf04f631fad00108893f5e9
2021-12-04 01:46:08 +00:00
Treehugger Robot
7939f4bca2 Merge "Add Soong variable for optimizing system Java" am: 742874e0e6
Original change: https://android-review.googlesource.com/c/platform/build/+/1896612

Change-Id: I0ca5c029e3bc6213179d67f923cf962b6c0474eb
2021-12-04 01:25:26 +00:00
Treehugger Robot
742874e0e6 Merge "Add Soong variable for optimizing system Java" 2021-12-04 01:07:34 +00:00
Colin Cross
4f8dd6fe45 Reuse license metadata files from Soong
Copy the license metadata files from Soong if they've already
been built.

Bug: 207445310
Test: m checkbuild
Change-Id: I142c192843e94b018079809bd596ff81136b2de3
2021-12-03 22:47:11 +00:00
Colin Cross
52a0c97e5a Revert "Revert "Move meta_lic files into per-module intermediates directories""
This reverts commit e41ad14f58.

Change-Id: I77211030b657b894002a1a1bded773b3c4b0334a
2021-12-03 22:46:20 +00:00
Jiyong Park
160149e42d Merge "Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND" 2021-12-03 10:56:52 +00:00
Cole Faust
f1f49bb910 Pass input variables to product config
Passing variables via a makefile instead of
rblf_cli / rblf_env allows us to give them correct
types while converting the makefile to starlark,
as opposed to the variables always being strings
when given via rblf_cli / rblf_env.

This also allows us to remove some hand-converted
starlark code.

Bug: 201700692
Test: ./out/soong/rbcrun ./build/make/tests/run.rbc
Change-Id: I58c4f20b29171c14e5ae759beb26a849426f6961
2021-12-02 20:47:31 -08:00
Colin Cross
20537eed38 Merge "Revert "Move meta_lic files into per-module intermediates directories"" am: ccb353501d am: d821c63926 am: 6a0f8bb9b4
Original change: https://android-review.googlesource.com/c/platform/build/+/1908224

Change-Id: I11ff04d6bc7092c23fb068d3a9765f132648623b
2021-12-03 01:32:01 +00:00
Colin Cross
6a0f8bb9b4 Merge "Revert "Move meta_lic files into per-module intermediates directories"" am: ccb353501d am: d821c63926
Original change: https://android-review.googlesource.com/c/platform/build/+/1908224

Change-Id: Ief03d7fdb95ebf69dbb721ac6bb75e8bfcff0952
2021-12-03 01:21:36 +00:00
Colin Cross
d821c63926 Merge "Revert "Move meta_lic files into per-module intermediates directories"" am: ccb353501d
Original change: https://android-review.googlesource.com/c/platform/build/+/1908224

Change-Id: Iffd05ce12c5338ebc545e6f3789431beae569bca
2021-12-03 01:06:06 +00:00