Commit Graph

29402 Commits

Author SHA1 Message Date
Cole Faust
cdadc953ae Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b am: 98a7011088 am: 03c397942c am: 16bc902d32
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: I2558431e26c26cfcdcd63314e238420b57916e03
2021-12-10 23:02:39 +00:00
Colin Cross
eedeaeb7d3 Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc am: b48261121e am: 8d6a7102ac am: 870134db7c
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

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

Change-Id: Idef267ecf33627ccd673a8d1205bd13c0b0ba6a3
2021-12-10 22:42:37 +00:00
Colin Cross
870134db7c Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc am: b48261121e am: 8d6a7102ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

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

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

Change-Id: I2425845206145cc4f3115017607299fb77354dfc
2021-12-10 22:20:35 +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
Nicolas Geoffray
df8b9c17b0 Merge "Use prebuilts of the ART Module by default in SC branches." into sc-v2-dev 2021-12-10 18:59:39 +00:00
Inseob Kim
b4cb3e0bb0 Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531 am: 7c708e2d27 am: 4d9cf5c4e7 am: 2f2b777d1b
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: I5ceeed7675529da528d87c86b8361d8e3a29a6ab
2021-12-10 13:20:34 +00:00
Inseob Kim
2f2b777d1b Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531 am: 7c708e2d27 am: 4d9cf5c4e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: I0644150683b13d8165704daead1380000906fb7c
2021-12-10 13:03:08 +00:00
Inseob Kim
4d9cf5c4e7 Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531 am: 7c708e2d27
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: Ifab9c475dd11183a6465ca48d911f5b86ecaee74
2021-12-10 12:50:56 +00: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
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
8baed09521 Merge "Allow multiple patterns in rblf_wildcard" am: 598cbbcde7 am: d4fcff6db8 am: 815db5926e am: d58659eb13
Original change: https://android-review.googlesource.com/c/platform/build/+/1915258

Change-Id: I6330f83ff1f649d50a9790af79e5e37a9d16ade7
2021-12-09 22:35:36 +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
Treehugger Robot
f7d376104b Merge "Explicitly set EROFS compression parameter" am: 1f9408b2b2 am: 48b1b7e6f0 am: 89bdc4cc04 am: e64c26e8d4
Original change: https://android-review.googlesource.com/c/platform/build/+/1908390

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

Change-Id: I30de20771748fffe4bc3660fa6d224b7b58c3653
2021-12-09 00:04:21 +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
6c14567d08 Merge "Add missing apksigner dependency" am: 1295bc5138 am: 37d01f684d am: e807b0639a am: 2f958913d9
Original change: https://android-review.googlesource.com/c/platform/build/+/1891388

Change-Id: I6d09052a823e2a2e55653b09f40dd4481ae514a0
2021-12-07 13:54:03 +00: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
7da45f7450 Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" am: 0d8d378bd4 am: 793100509c am: 19acbbea9c am: 86518a9506
Original change: https://android-review.googlesource.com/c/platform/build/+/1910142

Change-Id: Iaf6060a1364db56ea532507df2d8a4f7fe546ef9
2021-12-07 05:44:01 +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