Commit Graph

23868 Commits

Author SHA1 Message Date
Treehugger Robot
00317f0660 Merge "Generate module lib API and scope together" am: 0bcda81dd5 am: 6e6dd4be10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1367357

Change-Id: I047e414976c4eae6bfec37aa1c18bed2f6cb4063
2020-07-21 04:45:26 +00:00
Treehugger Robot
6e6dd4be10 Merge "Generate module lib API and scope together" am: 0bcda81dd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1367357

Change-Id: Ibd18089881cd898a26c3dd10a299e9cfa4010d93
2020-07-21 04:36:28 +00:00
Treehugger Robot
0bcda81dd5 Merge "Generate module lib API and scope together" 2020-07-21 04:21:07 +00:00
Treehugger Robot
8d00cdaee4 Merge "Add dist target for robolectric-tests.zip" am: 30c22b9c7a am: e45c3b1c6a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1367538

Change-Id: I145b4cb0fb1bec28a48ea42ca23ac236edbec175
2020-07-21 02:38:10 +00:00
Treehugger Robot
e45c3b1c6a Merge "Add dist target for robolectric-tests.zip" am: 30c22b9c7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1367538

Change-Id: I5e70cd5c1e9d256c762246fbda0d4f213bab421a
2020-07-21 02:17:51 +00:00
Treehugger Robot
30c22b9c7a Merge "Add dist target for robolectric-tests.zip" 2020-07-21 02:03:36 +00:00
Colin Cross
cf0e4220eb Add dist target for robolectric-tests.zip
Also remove stray fmt.Println.

Test: m robolectric-tests
Change-Id: Ia463c2b395fadd6ab33b2ce8364f2119b2a2be1e
2020-07-20 17:19:02 -07:00
Ivan Lozano
cf2152c684 Merge changes from topic "rust_bindgen" am: c3b1a61253 am: e1c5693a72
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1359848

Change-Id: I3826c3e8c86345377ffee45a9ed0e86c2d15e9bc
2020-07-20 21:51:14 +00:00
Ivan Lozano
e1c5693a72 Merge changes from topic "rust_bindgen" am: c3b1a61253
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1359848

Change-Id: I04bd52100c92eb19ba5c854fd871c1a1b8a4e6c2
2020-07-20 21:38:19 +00:00
Ivan Lozano
c3b1a61253 Merge changes from topic "rust_bindgen"
* changes:
  Allow rust module dependency on SourceProviders.
  Add SourceProviders and a rust_bindgen module type
2020-07-20 21:18:33 +00:00
Paul Duffin
15f34ef811 Generate module lib API and scope together
Previously, due to limitations in metalava the module lib API and stubs
source were generated separately. That limitation has since been
removed so this change optimizes the generating code.

Changes:
* Add an annotation field to apiScope to contain the annotation that
  identifies the scope.
* Rename droidstubArgs to extraArgs to better reflect that they are not
  passed to droidstubs.
* Rename droidstubsArgsForGeneratingStubsSource to droidstubsArgs.
* Remove droidstubsArgsForGeneratingApi and
  createStubsSourceAndApiTogether fields along with code that supports
  generating stubs source and the API separately.
* Fix the module lib test.

Test: m checkapi
Bug: 161364853
Change-Id: I821886bb68645addf5ae9c96ed2f4f3649151d1a
2020-07-20 20:51:25 +01:00
Colin Cross
6a472cd688 Merge "Add environment variables to control lint checks" am: dd35943b62 am: a333c3ee62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1364949

Change-Id: I81c68864c55e36aa800cb95627b7939578cd2752
2020-07-20 19:05:11 +00:00
Colin Cross
e078e398ab Merge "Package robolectric tests for tradefed" am: f0ba57bf33 am: b2760fd03d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1221882

Change-Id: Id9de4fe54ddabe54b07167f4e177ba0cb036a1a0
2020-07-20 19:05:00 +00:00
Colin Cross
a333c3ee62 Merge "Add environment variables to control lint checks" am: dd35943b62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1364949

Change-Id: I3073ef4ca25fe554f80170567a5a244975eda855
2020-07-20 19:00:04 +00:00
Colin Cross
dd35943b62 Merge "Add environment variables to control lint checks" 2020-07-20 18:50:09 +00:00
Colin Cross
b2760fd03d Merge "Package robolectric tests for tradefed" am: f0ba57bf33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1221882

Change-Id: I9905cb3b228bfc1dc6577f26b229acdb3d148e54
2020-07-20 18:45:56 +00:00
Colin Cross
f0ba57bf33 Merge "Package robolectric tests for tradefed" 2020-07-20 18:27:17 +00:00
Ivan Lozano
43845688bc Allow rust module dependency on SourceProviders.
Allow rust modules to depend on and use generated source code provided
by SourceProvider modules and genrule modules without resorting to
hardcoded output paths.

All generated sources are now copied to a dependent module's
intermediates directory, then OUT_DIR is set to point to that path when
calling rustc. This matches the common convention used in most rust
crates to include generated source code from the path defined in the
OUT_DIR environment variable.

A couple other small notable changes are included in this CL:

* prebuiltLibraries can no longer include generated source files as they
  should be prebuilt.
* srcPathFromModuleSrcs now excludes the main source file from the
  second return value so its a list of only the generated sources.

Bug: 159064919
Test: Local example rust_library compiles with rust_bindgen dependency.
Test: Local example rust_library compiles with genrule dependency.
Test: Collision detected when multiple providers produce similar output.
Test: New Soong tests pass.
Change-Id: I59f54a25368c680b9086420c47ec24ab8cd1de6b
2020-07-20 13:40:31 -04:00
Ivan Lozano
4fef93c53f Add SourceProviders and a rust_bindgen module type
Add SourceProvider modules which provides a base interface for more
complex code generation usecases such as bindgen. Also adds the
rust_bindgen module type which calls bindgen to generate Rust FFI
bindings to C.

Bug: 159064919
Test: Local test module generates bindings.
Test: New Soong tests pass.

Change-Id: Ie31467bbbe423497666ad837cf5fe1acd1e76bd8
2020-07-20 13:40:14 -04:00
Treehugger Robot
ebb60eca90 Merge "Add compile_multilib properties to all native prebuilts (reland)." am: 5df3439377 am: 5ae0c786e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1363559

Change-Id: I45ecd2494556cd015eeb656c7a83d18b4922b42a
2020-07-20 15:38:48 +00:00
Treehugger Robot
5ae0c786e0 Merge "Add compile_multilib properties to all native prebuilts (reland)." am: 5df3439377
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1363559

Change-Id: Ic8901b75183746101771e4f01f91c7a4fc4271b7
2020-07-20 15:28:08 +00:00
Treehugger Robot
5df3439377 Merge "Add compile_multilib properties to all native prebuilts (reland)." 2020-07-20 15:19:33 +00:00
Colin Cross
8eebb135b3 Package robolectric tests for tradefed
Package a slightly modified copy of the robolectric tests with
the dependencies statically included into the testcases directory
and into a robolectric-tests.zip.

Test: m robolectric-tests
Change-Id: I73f51727695136d2a849d36af1683e93f7e156a3
2020-07-19 19:33:40 -07:00
Treehugger Robot
615d01cae9 Merge "apex_set is force disabled when necessary" am: f70ceecc4c am: 005a5724ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1364697

Change-Id: Iee2b6e2c90304339df052806ea5e727ba7fffdab
2020-07-20 01:50:32 +00:00
Treehugger Robot
005a5724ca Merge "apex_set is force disabled when necessary" am: f70ceecc4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1364697

Change-Id: I4b558c1d904c2386a22e5e19cf73bc2b5ffaebc0
2020-07-20 01:32:53 +00:00
Treehugger Robot
f70ceecc4c Merge "apex_set is force disabled when necessary" 2020-07-20 01:17:06 +00:00
Makoto Onuki
d786b6bffe Merge "Repeat metalava errors at the end to make it easy to find them" am: d3cd2f5793 am: 0742acdc4b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1365957

Change-Id: Ifca7b65f4e27bf14cdc30f72f790b0de90130bae
2020-07-18 03:17:41 +00:00
Makoto Onuki
0742acdc4b Merge "Repeat metalava errors at the end to make it easy to find them" am: d3cd2f5793
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1365957

Change-Id: Id9ac68e431a6484a1c5ae150c163535248a32d01
2020-07-18 02:46:59 +00:00
Makoto Onuki
d3cd2f5793 Merge "Repeat metalava errors at the end to make it easy to find them" 2020-07-18 02:29:36 +00:00
Colin Cross
790a7d6ca7 [automerger skipped] Merge "Pass unstripped JNI libraries to Make" into rvc-dev am: 681d4b7cf1 -s ours
am skip reason: Change-Id Ieb4bffbb3d0a09f476da011399c5b8b1611929d7 with SHA-1 403cc15f1b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12181133

Change-Id: I7a52903f52381625ee060ab463e23867c18bfb8b
2020-07-17 22:42:56 +00:00
Makoto Onuki
0df103ae71 Repeat metalava errors at the end to make it easy to find them
Also suppress "unresolved import" messages.

Bug: 161374683
Test: Introduce a lint error, run "m update-api" and make sure the
    error shows up at the end.
Change-Id: Ib5250f7f9593dc4f89f9e7f6dc614e230a966e8f
2020-07-17 15:38:10 -07:00
Colin Cross
681d4b7cf1 Merge "Pass unstripped JNI libraries to Make" into rvc-dev 2020-07-17 22:16:01 +00:00
Dan Willemsen
453b4e1235 Merge "Add support for macOS 11 SDK" am: 59415ca60d am: 92601afd91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360927

Change-Id: I0eb2c3eb8638f02e14757e0f3079043400cf4664
2020-07-17 22:12:35 +00:00
Dan Willemsen
92601afd91 Merge "Add support for macOS 11 SDK" am: 59415ca60d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360927

Change-Id: I3e5b2f5fc5f502ed82635dde24b7403e298b31d7
2020-07-17 21:46:30 +00:00
Dan Willemsen
59415ca60d Merge "Add support for macOS 11 SDK" 2020-07-17 21:33:26 +00:00
Colin Cross
7b84020981 [automerger skipped] Merge changes from topic "lint-unbundled-apps" into rvc-dev am: db4d465142 -s ours
am skip reason: Change-Id I523c09016251377ff89d76084769be7401b95425 with SHA-1 c0efd1db13 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12175008

Change-Id: Ibd8f8651e5f176d4f1c12e546db0195d63ee8e1a
2020-07-17 20:53:44 +00:00
Colin Cross
db4d465142 Merge changes from topic "lint-unbundled-apps" into rvc-dev
* changes:
  Build a zip of transitive lint reports for apps
  Add DepSets
  Support lint on unbundled builds
2020-07-17 20:37:32 +00:00
Treehugger Robot
7d1576540b Merge changes Ide9c7a6a,I706c1433 am: f8b85dedde am: a02a0d012c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1365337

Change-Id: I5fb0dafda5d1547c96b6196cfe6eecf4618a16be
2020-07-17 20:32:42 +00:00
Treehugger Robot
a02a0d012c Merge changes Ide9c7a6a,I706c1433 am: f8b85dedde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1365337

Change-Id: I66efa33e2ddc8546979b44498c91eff0fc3ee423
2020-07-17 20:13:00 +00:00
Treehugger Robot
f8b85dedde Merge changes Ide9c7a6a,I706c1433
* changes:
  Add Validations to android.BuildParams
  Use validations for blueprint tests
2020-07-17 19:54:49 +00:00
Colin Cross
b32b71222e Pass unstripped JNI libraries to Make
Pass a list of unstripped JNI libraries to Make so that they can be
installed into the symbols directory.

Bug: 159726429
Test: forrest
Change-Id: Ieb4bffbb3d0a09f476da011399c5b8b1611929d7
Merged-In: Ieb4bffbb3d0a09f476da011399c5b8b1611929d7
(cherry picked from commit 403cc15f1b)
2020-07-17 19:11:05 +00:00
Liz Kammer
464e5f720c Merge "Add android app property rename_resources_package" into rvc-dev-plus-aosp 2020-07-17 16:56:04 +00:00
Martin Stjernholm
89238f4703 Add compile_multilib properties to all native prebuilts (reland).
There was a special case in cc_prebuilt_binary only, which resulted in
prebuilt libraries getting both 32 and 64 bit variants even when their
sources only had one of them, and the other variant would be defunct
since it wouldn't get any prebuilt artefact.

This moves the handling of compile_multilib completely to the common
update code, so that SDK members don't need to deal with it. It doesn't
take SDK member defaults into account, which means a bit more
boilerplate in the snapshots, but it's simpler and less error prone
(different SDK member types have different defaults).

This relands https://r.android.com/1359962 after disabling the SDK
tests on mac once and for all.

Bug: 151303681
Test: `go test -v ./sdk` in build/soong on mac and linux
Change-Id: I05f6603b2ac9b8676b25c3e297165ca23284e9cc
2020-07-17 14:32:15 +01:00
Martin Stjernholm
c280e57374 Merge "Add support for SDK tests with LinuxBionic OS type." am: 3044394329 am: 586854a699
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360539

Change-Id: Ic1d9d7a8e6d06ba77bab6738f714ad0adae27178
2020-07-17 12:13:39 +00:00
Martin Stjernholm
586854a699 Merge "Add support for SDK tests with LinuxBionic OS type." am: 3044394329
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360539

Change-Id: If4124502a6b0f4b69a5b65c2043e85d93dc734d9
2020-07-17 11:59:03 +00:00
Martin Stjernholm
3044394329 Merge "Add support for SDK tests with LinuxBionic OS type." 2020-07-17 11:46:12 +00:00
Jiyong Park
10e926bc8d apex_set is force disabled when necessary
prebuilt_apex has been disabled when the device is configured for
flattened APEXes, sanitized, instrumented, or built unbundled. However,
apex_set which is another type of APEX prebuilt wasn't disabled for the
same conditions.

This change fixes the discripency. apex_set modules are also force
disabled when the prebuilts are not expected.

Bug: 161316762
Bug: 160933444
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m
The built image has only the flattened APEXes and the device boots

Change-Id: I6c90dfb28d565861a473a1bdce93269ec370601d
2020-07-17 12:37:16 +09:00
Colin Cross
988dfcc067 Add environment variables to control lint checks
Set ANDROID_LINT_CHECK to a comma-separated list of lint issues
that should be checked instead of the defaults.  This will disable
all lint checks and enable only the given list.

Set ANDROID_LINT_CHECK_EXTRA_MODULES to a list of modules that provide
lint checks that should added to all modules when ANDROID_LINT_CHECK
is specified.

Bug: 153485543
Test: m ANDROID_LINT_CHECK=JavaKotlinApiUsedByModule ANDROID_LINT_CHECK_EXTRA_MODULES=JavaKotlinApiFinder TARGET_BUILD_APPS=Gallery2 lint-check dist
Change-Id: Ifdf9bf972b8550104315b0f5e98b34ad699dcb67
2020-07-16 17:37:04 -07:00
Ramy Medhat
378280f54b Merge "Generate RBE socket address randomly for each invocation of soong." am: 59b611d138 am: 78570cc5d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1365076

Change-Id: I41db6cd45a1957787e1deb3d19708bbf33453e40
2020-07-17 00:23:43 +00:00
Ramy Medhat
78570cc5d7 Merge "Generate RBE socket address randomly for each invocation of soong." am: 59b611d138
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1365076

Change-Id: I5ee0e1b36f725e607ac8a4531bc7335a9e383952
2020-07-17 00:04:02 +00:00