Commit Graph

48509 Commits

Author SHA1 Message Date
Treehugger Robot
e66197abab Merge "Fix CC-BY-ND licenses" am: 2b244217a2 am: 444727a285 am: e04b66de96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893223

Change-Id: I5b6a5109058b4c81c9fe91a10db0290730967c1c
2021-11-16 07:13:17 +00:00
Owen Kim
065fbeb146 Revert "Adds multi_install_skip_symbol_files field (default fals..."
Revert submission 1869814-vapex-multi-config

Bug: 206551398
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I55600009996329947&testResultId=TR93527797572038984, bug b/206551398
Reverted Changes:
I0cd9d748d:Adds multi_install_skip_symbol_files field (defaul...
I5912a18e3:Demonstrate multi-installed APEXes.
I0e6881e3a:Load persist props before starting apexd.
I932442ade:Adds a new prop context for choosing between multi...
I754ecc3f7:Allow users to choose between multi-installed vend...

Change-Id: If09bf590e3ad93e14fbf89299f80d497c9604a78
2021-11-16 07:08:15 +00:00
Treehugger Robot
e04b66de96 Merge "Fix CC-BY-ND licenses" am: 2b244217a2 am: 444727a285
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893223

Change-Id: I3b70c9e7d7026112d1d8b330330967d581b09614
2021-11-16 06:56:12 +00:00
Treehugger Robot
444727a285 Merge "Fix CC-BY-ND licenses" am: 2b244217a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893223

Change-Id: I47fb9a1e3b0c0e8ef32b41107d572ac7f389a99b
2021-11-16 06:36:39 +00:00
Treehugger Robot
2b244217a2 Merge "Fix CC-BY-ND licenses" 2021-11-16 06:20:34 +00:00
Treehugger Robot
501f02c3d0 Merge "Refactor ProductConfigProperties to use a struct key instead of an string key with hardcoded patterns." am: 59a5cb072b am: 7f98f45ff8 am: b8dc51a5cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892222

Change-Id: Id4975a82327f9f1815e794adba0b02a573a22f06
2021-11-16 05:42:01 +00:00
Treehugger Robot
b8dc51a5cc Merge "Refactor ProductConfigProperties to use a struct key instead of an string key with hardcoded patterns." am: 59a5cb072b am: 7f98f45ff8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892222

Change-Id: I037cba1d9ab2da0444d569d6a26dbfabdb510c9e
2021-11-16 05:31:38 +00:00
Treehugger Robot
7f98f45ff8 Merge "Refactor ProductConfigProperties to use a struct key instead of an string key with hardcoded patterns." am: 59a5cb072b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892222

Change-Id: I399e76d45b91e20a27ae1eafde83c4011bb407e3
2021-11-16 05:12:34 +00:00
Treehugger Robot
59a5cb072b Merge "Refactor ProductConfigProperties to use a struct key instead of an string key with hardcoded patterns." 2021-11-16 04:55:15 +00:00
Spandan Das
60999344a2 Update platform_apis error message
The updated error message is more descriptive about the incompatibility
between platform_apis and sdk_version. Implemented as per the discussion
in b/204447559#17

Test: In build/soong, run go test ./java
Bug: 204447559
Change-Id: I826f0ce47313b337f1754a1b6bc11ce65c837a41
2021-11-16 04:15:33 +00:00
Jingwen Chen
25825ca08d Refactor ProductConfigProperties to use a struct key instead of an
string key with hardcoded patterns.

This fixes a bug with label list conditions_default attrs where the
attribute values get clobbered in a map with the keys
"conditions_default" (with a default empty list) and
"acme__feature__conditions_default" (with a non-empty list) when
generating the LabelListAttribute.

Test: CI
Change-Id: I5429e40f747b7a0ed559f8a468a4831cd32df2c0
2021-11-16 02:50:22 +00:00
Bob Badour
df6099d688 Fix CC-BY-ND licenses
Should be by_exception_only

Test: m nothing
Change-Id: Ic93eacfd7f85d2f86fe5cc8ff35cd1c51cfdb54a
2021-11-15 17:55:37 -08:00
Daniel Norman
1417a11d82 Merge "Adds multi_install_skip_symbol_files field (default false) to apex." am: f012790f32 am: 6ddcbb7b26 am: 3e1d66958d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874413

Change-Id: Ia481389919dc077355efa26309e2df96150fa44f
2021-11-16 01:31:12 +00:00
Daniel Norman
3e1d66958d Merge "Adds multi_install_skip_symbol_files field (default false) to apex." am: f012790f32 am: 6ddcbb7b26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874413

Change-Id: Iad6ce601d8c0597b1389aedd299c4dfdb58d77bc
2021-11-16 01:15:24 +00:00
Daniel Norman
6ddcbb7b26 Merge "Adds multi_install_skip_symbol_files field (default false) to apex." am: f012790f32
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874413

Change-Id: Ie50478b92964db232bbfa3051113b90c36213fcd
2021-11-16 00:56:56 +00:00
Daniel Norman
f012790f32 Merge "Adds multi_install_skip_symbol_files field (default false) to apex." 2021-11-16 00:45:32 +00:00
Cole Faust
a87b1f70c0 Merge "Allow generic if statements" am: 6d0500d556 am: fa3e050580 am: b2a9496fb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889720

Change-Id: I6ef5b7e209b2447bc014da99809a6d16c65d1fe2
2021-11-16 00:07:35 +00:00
Treehugger Robot
01d0bea262 Merge "Refactor bp2build tests" am: ae1276a2db am: 7d831ebf31 am: cee08d5826
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889240

Change-Id: Iac85e10e16c79ac6003c7aa93a392b745961defe
2021-11-16 00:07:28 +00:00
Cole Faust
b2a9496fb6 Merge "Allow generic if statements" am: 6d0500d556 am: fa3e050580
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889720

Change-Id: I9a65088e30983e039cd72e921a8b37952b28c2ea
2021-11-15 23:55:54 +00:00
Treehugger Robot
cee08d5826 Merge "Refactor bp2build tests" am: ae1276a2db am: 7d831ebf31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889240

Change-Id: I672b272903cb9d588aa6ed79624d8d34fa0c7569
2021-11-15 23:55:33 +00:00
Cole Faust
fa3e050580 Merge "Allow generic if statements" am: 6d0500d556
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889720

Change-Id: I68ead331b44ff56758be868a5d1d455dff6081b8
2021-11-15 23:42:27 +00:00
Treehugger Robot
7d831ebf31 Merge "Refactor bp2build tests" am: ae1276a2db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889240

Change-Id: I20dfb4934b3a35d3485e4d25c982c82a1bdd859f
2021-11-15 23:42:22 +00:00
Cole Faust
6d0500d556 Merge "Allow generic if statements" 2021-11-15 23:26:48 +00:00
Treehugger Robot
ae1276a2db Merge "Refactor bp2build tests" 2021-11-15 23:21:10 +00:00
Ivan Lozano
61bd087651 Merge "Use new soong_cc_rust_prebuilt.mk" am: 3e1bc6cc0d am: 7e68fdef86 am: c7a2d4b4aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890877

Change-Id: I89601c1e9511d26091bd8c1669c35694e6590b61
2021-11-15 23:09:49 +00:00
Ivan Lozano
c7a2d4b4aa Merge "Use new soong_cc_rust_prebuilt.mk" am: 3e1bc6cc0d am: 7e68fdef86
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890877

Change-Id: Ie42ecb95e03fcf234d55cd95077a6f72b34fec8a
2021-11-15 22:56:11 +00:00
Ivan Lozano
7e68fdef86 Merge "Use new soong_cc_rust_prebuilt.mk" am: 3e1bc6cc0d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890877

Change-Id: I53841b27d24d8bc43428aaec8f03316055c4ab8a
2021-11-15 22:37:46 +00:00
Ivan Lozano
3e1bc6cc0d Merge "Use new soong_cc_rust_prebuilt.mk" 2021-11-15 22:19:46 +00:00
Ivan Lozano
4e5f07d27b rust: Add data_libs and data_bins to rust_test
Allows defining data binaries and libraries that should be installed
alongside a rust_test module, similar to cc_test.

This refactors cc_test as well so it can define rust_ffi_shared and
rust_binary modules as data.

Bug: 171710847
Test: New Soong tests pass.
Test: Example module installs data appropriately.
Change-Id: I0b56098fb475ec54f9b7a761220d260fe68cbee1
2021-11-15 17:18:42 -05:00
Ivan Lozano
c2ca1ee83d rust: Add Recovery Snapshot Soong tests for rust.
Bug: 197866992
Test: m nothing
Change-Id: I4b5401cf2ffa0dbcc6fea60f90bad4c47a9d5e6b
2021-11-15 17:11:20 -05:00
Ivan Lozano
edcaab7284 Merge "rust: Skip global 'fuzzer' sanitizer static bins" am: 92a89ed1c5 am: 5724664674 am: 79a8bbe799
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892595

Change-Id: I04f2643f344b7962300c09fd78b2409c126539b7
2021-11-15 20:12:33 +00:00
Ivan Lozano
79a8bbe799 Merge "rust: Skip global 'fuzzer' sanitizer static bins" am: 92a89ed1c5 am: 5724664674
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892595

Change-Id: Ie5bbe51c7946a2516247732bea37f3df321f5e9e
2021-11-15 19:53:07 +00:00
Ivan Lozano
5724664674 Merge "rust: Skip global 'fuzzer' sanitizer static bins" am: 92a89ed1c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892595

Change-Id: I8d2e59692d6fb99fea29dc8242de0747909fc23f
2021-11-15 19:35:28 +00:00
Cole Faust
f83202143a Allow generic if statements
Previously, only comparisons between strings/variable references
and other strings/variable references or certain function calls
were allowed. After this cl, any two starlark expressions can
be compared. If they have different types, they will be converted
to strings first.

Fixes: 205995738
Bug: 201700692
Test: go test
Change-Id: Ib463de7b24d3abcd032dbdcba7c3f1351c314d01
2021-11-15 11:29:29 -08:00
Ivan Lozano
92a89ed1c5 Merge "rust: Skip global 'fuzzer' sanitizer static bins" 2021-11-15 19:17:54 +00:00
Trevor Radcliffe
d15f16139d Merge "Document possible values of sdk_version" am: 8dae331d4a am: e25e42957e am: f425515dcd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1882849

Change-Id: I186df636730fde7a2909843b485085d783759117
2021-11-15 19:09:47 +00:00
Trevor Radcliffe
f425515dcd Merge "Document possible values of sdk_version" am: 8dae331d4a am: e25e42957e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1882849

Change-Id: I454cae936c6a937f5cfefe72df2c141290edbabb
2021-11-15 18:53:00 +00:00
Trevor Radcliffe
e25e42957e Merge "Document possible values of sdk_version" am: 8dae331d4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1882849

Change-Id: I80b3b8d5d0fd27f20d95a03efcd21c0b1b8ded13
2021-11-15 18:39:40 +00:00
Trevor Radcliffe
8dae331d4a Merge "Document possible values of sdk_version" 2021-11-15 18:28:00 +00:00
Ivan Lozano
1acabfd5fe Merge "rust: Only apply hwasan flags once to fuzz targets" am: 602227bcb5 am: 42f8b77142 am: c9d15af4c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1891695

Change-Id: Id27e1fcffa78cc46980f0d0ea77ebb248a5b0c4f
2021-11-15 16:39:36 +00:00
Ivan Lozano
c9d15af4c9 Merge "rust: Only apply hwasan flags once to fuzz targets" am: 602227bcb5 am: 42f8b77142
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1891695

Change-Id: I8042d81aec25e9a1b5d9b53224373d0676cfa6fa
2021-11-15 16:28:06 +00:00
Ivan Lozano
42f8b77142 Merge "rust: Only apply hwasan flags once to fuzz targets" am: 602227bcb5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1891695

Change-Id: Ib2f920502e7e80f3b1a98975e9336c655333e94b
2021-11-15 16:16:07 +00:00
Liz Kammer
78cfdaa597 Refactor bp2build tests
Moves to specifying attributes as a map, such at it is possible to add
additional attributes conditionally. This is in particular useful once
supporting the `enabled` property which will add
`target_compatible_with`

Test: go test soong tests
Change-Id: Iade8eed1ce3acb1d1712a9ee3119d9ae59675624
2021-11-15 11:09:05 -05:00
Ivan Lozano
602227bcb5 Merge "rust: Only apply hwasan flags once to fuzz targets" 2021-11-15 16:03:31 +00:00
Ivan Lozano
6c5b8f4e02 rust: Skip global 'fuzzer' sanitizer static bins
The 'fuzzer' sanitizer enables 'hwasan', which is not supported for Rust
static binaries. Make sure we skip applying this sanitizer to those
binaries.

Bug: 204776996
Test: SANITIZE_TARGET=fuzzer m <static_rust_executable>
Change-Id: I619cfab32b46c0811590973344eb5cdbe3f1a119
2021-11-15 09:35:12 -05:00
Rupert Shuttleworth
f1cb48b489 Merge "Allow libbuildversion to build with Bazel, but skip its 'tests' subdir for now." am: c0d9f8bd5e am: b75047f16f am: 86c453a41f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887076

Change-Id: I94a14fab344a81b1eb7ce45dd8ceb0c870ec35b9
2021-11-15 10:10:00 +00:00
Rupert Shuttleworth
86c453a41f Merge "Allow libbuildversion to build with Bazel, but skip its 'tests' subdir for now." am: c0d9f8bd5e am: b75047f16f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887076

Change-Id: Ia8b7a5920ae813e57544b40dbd78ecd8add82e53
2021-11-15 09:46:21 +00:00
Rupert Shuttleworth
b75047f16f Merge "Allow libbuildversion to build with Bazel, but skip its 'tests' subdir for now." am: c0d9f8bd5e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887076

Change-Id: I8ca53e650941c5de7baa836a4a8abf88be2d60c6
2021-11-15 09:28:28 +00:00
Rupert Shuttleworth
c0d9f8bd5e Merge "Allow libbuildversion to build with Bazel, but skip its 'tests' subdir for now." 2021-11-15 09:00:12 +00:00
Sophie Zheng
a31ea43aaa Merge "Java APIs used by Mainline modules." am: 7b5fa4277f am: 2a27e47fbd am: 587dbb8553
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887228

Change-Id: Ib0a9ac8109b77d4d4f89e76a56d709be3b896d9b
2021-11-15 07:21:31 +00:00