Commit Graph

40521 Commits

Author SHA1 Message Date
Christopher Parsons 6c025c3929 Merge "Fix note_memtag bionic libraries in mixed builds" am: b7c6a7ef36 am: 27798cb5d6 am: ff2a9c6ada
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663541

Change-Id: I0d248d953a3a9463c5eb87ed37e5c9e4dd156c7b
2021-04-06 19:54:54 +00:00
Christopher Parsons ff2a9c6ada Merge "Fix note_memtag bionic libraries in mixed builds" am: b7c6a7ef36 am: 27798cb5d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663541

Change-Id: Ie2a89fe8bd23e45824e138a26c4cd43f3fab3984
2021-04-06 19:29:11 +00:00
Christopher Parsons 27798cb5d6 Merge "Fix note_memtag bionic libraries in mixed builds" am: b7c6a7ef36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663541

Change-Id: I172aae16a2682a4e37ab6c310d5cfbffa9bf196f
2021-04-06 18:42:41 +00:00
Treehugger Robot 4f9c3c25e6 Merge "Only include used requests in cquery starlark" am: e09691ce78 am: 7527d76f53 am: 2292af0f2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664540

Change-Id: I73ee24f47264e56da511def38977e0464e7f0c1d
2021-04-06 18:26:09 +00:00
Martin Stjernholm ae15fe4e2b Merge "Allow dependencies from platform variants to APEX modules (reland)." am: 313a349d6b am: bb4aa7c1c1 am: da18e6832b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664028

Change-Id: I9e836e76724a9d8b20970bc77159eca1f45b7e81
2021-04-06 18:24:59 +00:00
Treehugger Robot 8cb6f47cde Merge "Remove unused constants for cquery requests" am: 06a466256d am: 2278624e5b am: 4bfa990c45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664539

Change-Id: Ie45915035dc6ef9b295746e8744dc3b775d56379
2021-04-06 18:22:41 +00:00
Christopher Parsons b7c6a7ef36 Merge "Fix note_memtag bionic libraries in mixed builds" 2021-04-06 17:57:59 +00:00
Treehugger Robot 2292af0f2e Merge "Only include used requests in cquery starlark" am: e09691ce78 am: 7527d76f53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664540

Change-Id: I3da39689827b5afdb473ec17c4d2d2863daa1251
2021-04-06 17:38:01 +00:00
Martin Stjernholm da18e6832b Merge "Allow dependencies from platform variants to APEX modules (reland)." am: 313a349d6b am: bb4aa7c1c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664028

Change-Id: I6816db036c453f72fcd9852bdb9b2f5127a20ce5
2021-04-06 17:37:05 +00:00
Treehugger Robot 4bfa990c45 Merge "Remove unused constants for cquery requests" am: 06a466256d am: 2278624e5b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664539

Change-Id: Ie6c9a408518943d3b81752437a5e9bd0999d665e
2021-04-06 17:36:15 +00:00
Treehugger Robot 7527d76f53 Merge "Only include used requests in cquery starlark" am: e09691ce78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664540

Change-Id: Ic57642f2d1bad148bb68dce09b5ebdda1b816745
2021-04-06 17:10:22 +00:00
Martin Stjernholm bb4aa7c1c1 Merge "Allow dependencies from platform variants to APEX modules (reland)." am: 313a349d6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664028

Change-Id: I11060cdc71bdb79d8868affffb7a59f7e964cb7f
2021-04-06 17:10:12 +00:00
Treehugger Robot 2278624e5b Merge "Remove unused constants for cquery requests" am: 06a466256d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664539

Change-Id: I1a0221124052a657d202707e5be58124f344b0bd
2021-04-06 17:04:29 +00:00
Treehugger Robot e09691ce78 Merge "Only include used requests in cquery starlark" 2021-04-06 16:05:20 +00:00
Martin Stjernholm 313a349d6b Merge "Allow dependencies from platform variants to APEX modules (reland)." 2021-04-06 15:57:00 +00:00
Treehugger Robot 06a466256d Merge "Remove unused constants for cquery requests" 2021-04-06 15:55:17 +00:00
Anton Hansson 7d77358231 Merge "Set min_sdk_version for java imports in pom2bp" am: 85822e9b5f am: 35a40611a7 am: 5a8e5100d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655693

Change-Id: If714977e25e52995fca6e45e73c33ac823661b86
2021-04-06 13:42:26 +00:00
Martin Stjernholm ec00900f83 Allow dependencies from platform variants to APEX modules (reland).
When `test_for` dependencies are added from libraries to APEX modules,
they can be created from the platform variants of the libraries, since
those are used for building tests. Hence we need an alias from the
platform variant of the APEX module to have a target for those
dependencies.

This is only necessary for libraries that are split by the APEX
mutator, i.e. is a member of some APEX. Normally that's not the case
for test libraries, but there may be exceptions (read
com.android.art.testing).

This relands https://r.android.com/1654679 after decoupling it from the
topic that caused b/184239856.

Test: m nothing
Bug: 183882457
Change-Id: If643c75ce9bc25fa01ad9d1e3ba8e1d060d03bb2
2021-04-06 14:24:26 +01:00
Anton Hansson 5a8e5100d6 Merge "Set min_sdk_version for java imports in pom2bp" am: 85822e9b5f am: 35a40611a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655693

Change-Id: I1c8c1502590f74824390d95710f9053543daf54e
2021-04-06 12:57:02 +00:00
Anton Hansson 35a40611a7 Merge "Set min_sdk_version for java imports in pom2bp" am: 85822e9b5f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655693

Change-Id: I7cc8506089ded17a902b4df5f2931e442fb7e542
2021-04-06 12:35:50 +00:00
Jingwen Chen 14ac490b34 Merge "Add target/os configurable string_list attrs." am: 8f8029a92b am: 695b00f3fc am: c72347401b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664303

Change-Id: I6775cb20a8e62c98591ba18fb8c2870236eef9b5
2021-04-06 11:48:35 +00:00
Anton Hansson 85822e9b5f Merge "Set min_sdk_version for java imports in pom2bp" 2021-04-06 11:46:30 +00:00
Jingwen Chen c72347401b Merge "Add target/os configurable string_list attrs." am: 8f8029a92b am: 695b00f3fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664303

Change-Id: I3ed15ace296b67e61a69269d236a1eff7d995624
2021-04-06 11:01:50 +00:00
Jingwen Chen 695b00f3fc Merge "Add target/os configurable string_list attrs." am: 8f8029a92b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1664303

Change-Id: Iaf89884f306c216bdc2b9703758bc8b9ea25441b
2021-04-06 10:19:36 +00:00
Jingwen Chen 8f8029a92b Merge "Add target/os configurable string_list attrs." 2021-04-06 09:47:24 +00:00
Lukacs T. Berki 9b37cf5e47 Add dumping the module graph in JSON format. am: 97bb9f18ea am: 9702c78cee am: a4710bf5c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662444

Change-Id: Iaddc41b7735c9cbed80b4bf17fc9a49e0e713157
2021-04-06 09:42:32 +00:00
Lukacs T. Berki a4710bf5c0 Add dumping the module graph in JSON format. am: 97bb9f18ea am: 9702c78cee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662444

Change-Id: I663625d311bca8abf7b5004d8f5d7a8ff7b346f4
2021-04-06 08:55:58 +00:00
Lukacs T. Berki 9702c78cee Add dumping the module graph in JSON format. am: 97bb9f18ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662444

Change-Id: If1baea6725b53ef996bc58f049fc8be89099963a
2021-04-06 08:10:27 +00:00
Lukacs T. Berki 97bb9f18ea Add dumping the module graph in JSON format.
Usage: SOONG_DUMP_MODULE_GRPH_JSON=<filename> m nothing

Test: The new test case in bootstrap_test.sh .
Change-Id: I69005a75d47dff915d27187645d0cd1cbb3467ef
2021-04-06 08:45:58 +02:00
Treehugger Robot dd62393313 Merge changes Id33bf640,I4d67b9b9 am: 8c56183fb7 am: b17e061ae9 am: a7fe23c458
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663139

Change-Id: Ic1434fc150e802f3a6e8b58a9a6f3e16e93da146
2021-04-06 05:29:49 +00:00
Treehugger Robot a7fe23c458 Merge changes Id33bf640,I4d67b9b9 am: 8c56183fb7 am: b17e061ae9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663139

Change-Id: I0128e2d5bf70a7cce8b16b78a62434c819b09de4
2021-04-06 04:42:35 +00:00
Treehugger Robot b17e061ae9 Merge changes Id33bf640,I4d67b9b9 am: 8c56183fb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663139

Change-Id: I612f736835ecd11d9317cc1dbf3f6508df0a7f46
2021-04-06 03:58:29 +00:00
Treehugger Robot 8c56183fb7 Merge changes Id33bf640,I4d67b9b9
* changes:
  Don't use incorrect version names like VER or BOARD even in tests
  SdkSpec = Scope + ApiLevel
2021-04-06 03:18:16 +00:00
Colin Cross 713718317f Merge "Remove support for unsandboxed metalava" am: 7fef94f57b am: b60432e4c8 am: f9b5ed2b8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660772

Change-Id: I8b624e1844d508121ad613110019d4478043657a
2021-04-06 01:33:50 +00:00
Colin Cross f9b5ed2b8e Merge "Remove support for unsandboxed metalava" am: 7fef94f57b am: b60432e4c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660772

Change-Id: I414edb7808f35e5db56edf6d1b0693cfe288b33d
2021-04-06 00:42:50 +00:00
Colin Cross b60432e4c8 Merge "Remove support for unsandboxed metalava" am: 7fef94f57b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660772

Change-Id: I0994f58d3e8e445b082d7192672ddf035041aefb
2021-04-06 00:00:28 +00:00
Colin Cross 7fef94f57b Merge "Remove support for unsandboxed metalava" 2021-04-05 23:23:00 +00:00
Sophie Zheng 282483013e [automerger skipped] Merge "NDK API coverage" into mainline-prod am: d148a481fd -s ours
am skip reason: skip tag Change-Id I799e03ad7d81a4184229f658fd6c8824b9ba6e1f with SHA-1 ae5da5ba78 is already in history

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

Change-Id: Ie0faef3f349a49f08b6637dcc2510c2accd4b0b8
2021-04-05 21:14:19 +00:00
Christopher Parsons 1d1d206874 Merge "Use correct includes for mixed build gen headers" am: 012ae1f4e0 am: 349bd6a36b am: 5002f7beba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660760

Change-Id: I73b863ce8cc06cccf8efffb6cd4893db8cc8cb6a
2021-04-05 20:53:08 +00:00
Joel Galenson 09577faf2d Merge "Add system/core/libstats to the Rust allowed list." am: 1301b5ccad am: e2cc68f506 am: ecce9fbc85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658923

Change-Id: I092d27d99dc174f8d4de7a321252e66010443fa4
2021-04-05 20:52:29 +00:00
Christopher Parsons 5002f7beba Merge "Use correct includes for mixed build gen headers" am: 012ae1f4e0 am: 349bd6a36b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660760

Change-Id: I0543398b469b2ffa825712268b258ec4c0158fef
2021-04-05 20:06:25 +00:00
Joel Galenson ecce9fbc85 Merge "Add system/core/libstats to the Rust allowed list." am: 1301b5ccad am: e2cc68f506
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658923

Change-Id: Ib6b60163e986e0024d67991a74af8979e4a8a67a
2021-04-05 20:06:12 +00:00
Sophie Zheng d148a481fd Merge "NDK API coverage" into mainline-prod 2021-04-05 20:03:58 +00:00
Chris Parsons eefc9e6a62 Fix note_memtag bionic libraries in mixed builds
Required fixes:
  - Set MakeLinkType for libraries, even in mixed build mode.
  - Set snapshot header information to empty list, which passes
        validation logic for depending modules

Fixing these libraries also requires a Starlark change to
cc_library_static.bzl, which will be submitted separately.

Additionally, this adds better error messaging in the event that
output files are missing from a mixed-build library.

Test: USE_BAZEL_ANALYSIS=1 m libc
Test: USE_BAZEL_ANALYSIS=1 m runtime-module-sdk
Change-Id: Iad2c4d46359986fb0a43263292a15ed45fabbac7
2021-04-05 15:27:55 -04:00
Sophie Zheng 8fe1697129 [automerger skipped] Merge "NDK API coverage" into mainline-prod am: 42e89aa6c4 -s ours
am skip reason: skip tag Change-Id I6150d5bda0d59828a985cd2ab5dd0aa38a7987c3 with SHA-1 d3e2742ad2 is already in history

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

Change-Id: Iea3858ecad2844c6529ed75b832fbd93b7b4c0f6
2021-04-05 19:26:31 +00:00
Christopher Parsons 349bd6a36b Merge "Use correct includes for mixed build gen headers" am: 012ae1f4e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660760

Change-Id: I6107b03160e7976774d522bdb9f2e5222c1818ba
2021-04-05 19:23:03 +00:00
Joel Galenson e2cc68f506 Merge "Add system/core/libstats to the Rust allowed list." am: 1301b5ccad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658923

Change-Id: I6b59cc2642c4589092189d338419641762a14f8b
2021-04-05 19:22:15 +00:00
Christopher Parsons 012ae1f4e0 Merge "Use correct includes for mixed build gen headers" 2021-04-05 19:03:47 +00:00
Sophie Zheng 42e89aa6c4 Merge "NDK API coverage" into mainline-prod 2021-04-05 18:56:13 +00:00
Joel Galenson 1301b5ccad Merge "Add system/core/libstats to the Rust allowed list." 2021-04-05 18:50:47 +00:00