Commit graph

46663 commits

Author SHA1 Message Date
Owen Kim
a10ebe60ab Merge "Revert "Adds multi_install_skip_symbol_files field (default fals..."" 2021-11-16 08:39:27 +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
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
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
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
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
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
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
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
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
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
2a27e47fbd Merge "Java APIs used by Mainline modules." am: 7b5fa4277f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887228

Change-Id: I2af77f52c7d56b7dccdf83d19cb0121aa648b3d7
2021-11-15 06:59:16 +00:00
Sophie Zheng
7b5fa4277f Merge "Java APIs used by Mainline modules." 2021-11-15 06:40:31 +00:00
Ivan Lozano
f3e8fc3f0b rust: Only apply hwasan flags once to fuzz targets
On HWASAN global sanitized builds, fuzz targets had hwasanFlags applied
twice. Rust only allows llvm-args flags to be passed in once however, so
this broke compilation.

Bug: 204915322
Test: SANITIZE_TARGET='hwaddress fuzzer' m <fuzzer>
Change-Id: I4f6c35e04bc4c891d9c66e8a53c3dcb88e8670cf
2021-11-13 07:46:05 -05:00
Colin Cross
4c05008f42 Merge "Mark vndkLibrariesTxt modules as device modules" am: cb16a92ee4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889921

Change-Id: I3487c58d6f641773558b3720941f8a894efa762a
2021-11-12 23:46:10 +00:00
sophiez
0234737f30 Java APIs used by Mainline modules.
Add scripts to generate java APIs used by Mainline modules. This is
aosp/1879177 with fixed build error that caused by dexdeps analyzing
resource only APKs which doesn't contains any .dex files. Now skip the
error generates in that case in gen_java_usedby_apex.sh

Forrest run:https://android-build.googleplex.com/builds/abtd/run/L38900000951898586

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: Id539cbe1b7306ace69c047f95ffc02265a467511
2021-11-12 23:39:35 +00:00
Colin Cross
cb16a92ee4 Merge "Mark vndkLibrariesTxt modules as device modules" 2021-11-12 23:30:51 +00:00
Treehugger Robot
350f901177 Merge "Allow open-dice to build tests for generatied open-dice rust bindings." am: 70275c031e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890803

Change-Id: If1966448b218ccd38f20241294ccc3f320c8114d
2021-11-12 20:57:42 +00:00
Daniel Norman
e19437e8f7 Adds multi_install_skip_symbol_files field (default false) to apex.
Multi-installed APEXes share the same apex_name and are installed
at the same time.

Should be set to true for all multi-installed APEXes except the singular
default version within the multi-installed group.
Only the default version can install symbol files in $(PRODUCT_OUT}/apex,
or else conflicting build rules may be created.

Bug: 199290365
Test: see https://r.android.com/1872018
Change-Id: I0cd9d748d7be3a2de40ed14f13bad71912457ddc
2021-11-12 20:45:50 +00:00
Treehugger Robot
70275c031e Merge "Allow open-dice to build tests for generatied open-dice rust bindings." 2021-11-12 20:38:53 +00:00
Janis Danisevskis
73f2104588 Allow open-dice to build tests for generatied open-dice rust bindings.
Test: N/A
Bug: 205626417
Change-Id: Iafa79f07005b9863468252828c74ee199279c457
2021-11-12 20:33:49 +00:00
Ivan Lozano
00713727b7 Merge "rust: Support new rust_stdlib_prebuilt_host type" am: 52a3e36c92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888868

Change-Id: I4a554b7dfd9827a9c65ebf31e099c5de6d5a75a2
2021-11-12 19:50:08 +00:00
Ivan Lozano
b84c426099 Merge changes I26198187,Ia904d07b am: 94e8a651fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877339

Change-Id: I07a8f5583e867b0c395ec42540ea8448a2bc6a2c
2021-11-12 19:45:01 +00:00
Ivan Lozano
52a3e36c92 Merge "rust: Support new rust_stdlib_prebuilt_host type" 2021-11-12 19:35:03 +00:00
Ivan Lozano
94e8a651fa Merge changes I26198187,Ia904d07b
* changes:
  rust: Support MTE memtag_heap sanitizer
  rust: Support global sanitizers
2021-11-12 19:26:04 +00:00
Cole Faust
5abf961c8d Merge "Convert soong scripts to python 3" am: 4220a61349
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1886447

Change-Id: I4c51bb28214d384e8f66b5cba92c71897604912a
2021-11-12 19:15:17 +00:00
Colin Cross
35ee47dcbf Merge "Revert "Move apex module installation into Soong"" am: 152911f807
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890806

Change-Id: Iaa000333e09fd0a87738c66709f4c390f80a36b4
2021-11-12 19:15:13 +00:00
Cole Faust
9585062240 Merge "Make handleSimpleStatement also handle if statements" am: 80374405df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885112

Change-Id: I1e05d7e665ae80d657d7a67556749072fc8731e9
2021-11-12 19:15:06 +00:00
Cole Faust
4220a61349 Merge "Convert soong scripts to python 3" 2021-11-12 19:04:31 +00:00
Colin Cross
152911f807 Merge "Revert "Move apex module installation into Soong"" 2021-11-12 19:02:30 +00:00
Cole Faust
80374405df Merge "Make handleSimpleStatement also handle if statements" 2021-11-12 19:01:41 +00:00