Commit Graph

35293 Commits

Author SHA1 Message Date
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
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
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
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
Anton Hansson
85822e9b5f Merge "Set min_sdk_version for java imports in pom2bp" 2021-04-06 11:46:30 +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
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
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
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
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
Joel Galenson
1301b5ccad Merge "Add system/core/libstats to the Rust allowed list." 2021-04-05 18:50:47 +00:00
Ivan Lozano
5e4d586b7f Merge "rust: Update libfuzzer flags for rust_fuzz" am: d235269392
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663380

Change-Id: I579d4360e4decc137078c9677681abde86bc8c92
2021-04-05 15:47:50 +00:00
Ivan Lozano
d235269392 Merge "rust: Update libfuzzer flags for rust_fuzz" 2021-04-05 15:05:00 +00:00
Liz Kammer
b54a6c4457 Merge "Add bazel_module properties to cc_defaults" am: 9962daec01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660764

Change-Id: I67f01a4339bfeef793ca2d62ea73e68527746eb5
2021-04-05 13:04:00 +00:00
Liz Kammer
0202caa0fd Remove unused constants for cquery requests
Test: go test soong tests
Change-Id: I63bfff2b1fb2efecf0811b842ffcad874c83fc50
2021-04-05 08:47:43 -04:00
Liz Kammer
9962daec01 Merge "Add bazel_module properties to cc_defaults" 2021-04-05 12:33:21 +00:00
Jingwen Chen
c1c2650532 Add target/os configurable string_list attrs.
Starting with copts for cc_object, with an extracted function that can
be shared with other cc_* module types.

Test: TH
Change-Id: I9025232e83a3dcd0ca243387486fafbdbd3e2d9b
2021-04-05 11:27:19 +00:00
Jingwen Chen
16795963e9 Merge "Add os/target configurable selects for label list attributes." am: 1a6bbbd990
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652048

Change-Id: I7299aee434717d8087ceeec2f5851fb129f9bef7
2021-04-05 07:40:59 +00:00
Jingwen Chen
1a6bbbd990 Merge "Add os/target configurable selects for label list attributes." 2021-04-05 07:09:48 +00:00
Jiyong Park
f58c46e36f Don't use incorrect version names like VER or BOARD even in tests
All version names will go through ApiLevelFromUser which triggers an
error when the name is not a valid one.

Bug: 175678607
Test: m
Change-Id: Id33bf64085603914d45ad7942cb8908a4734493f
2021-04-05 09:32:06 +09:00
Jiyong Park
54105c48f4 SdkSpec = Scope + ApiLevel
SdkSpec.Version was an int type. Now it becomes ApiLevel type which
is a better abstraction of the version (or api level).

Bug: 1655587
Test: m

Change-Id: I4d67b9b9eae45f653b6af4f5b73da9e091b3dfab
2021-04-05 09:32:06 +09:00
Inseob Kim
726c75b9d9 Merge "Support super image size automatic calculation" am: 0774773a65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658164

Change-Id: I5acf77756b7bd85be2c111510d88058efc3acbe6
2021-04-04 11:11:17 +00:00
Inseob Kim
0774773a65 Merge "Support super image size automatic calculation" 2021-04-04 10:46:25 +00:00
Jiyong Park
7ff95eca2f Merge "Move java.sdkSpec to the android package" am: d4fa8fc107
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655587

Change-Id: I0a90dcb1342c670a0e32e081051069aad492fc48
2021-04-03 11:48:14 +00:00
Jiyong Park
d4fa8fc107 Merge "Move java.sdkSpec to the android package" 2021-04-03 11:20:10 +00:00
Yi Kong
171c509cb9 Merge "Fix toc.sh, llvm-nm does not recognise '-f P' option" am: 15f5d688d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663144

Change-Id: I27e1f231813a350a3eabfc17aba6ae172546710b
2021-04-03 04:46:41 +00:00
Yi Kong
15f5d688d0 Merge "Fix toc.sh, llvm-nm does not recognise '-f P' option" 2021-04-03 03:59:26 +00:00
Rupert Shuttleworth
523b14d5c4 Merge "Allow Bazel actions to see the SHELL variable." am: 176cf46f40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663462

Change-Id: I26595f770e8db4b3ffa8b45f74414aaed3bad81e
2021-04-03 03:41:36 +00:00
Rupert Shuttleworth
176cf46f40 Merge "Allow Bazel actions to see the SHELL variable." 2021-04-03 03:07:36 +00:00
Jiyong Park
f1691d2a2c Move java.sdkSpec to the android package
... in preparation for making the handling of sdk versions consistent
across java and cc modules.

Bug: 175678607
Test: m
Change-Id: I598f0454bce9b7320621022115412fbe97403945
2021-04-03 08:25:12 +09:00
Treehugger Robot
c7a2bd6b6e Merge "Remove unused cquery requests." am: 100d5d6732
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663379

Change-Id: I06feaf98a951e271916dbd26bc07da0e5ec4ad08
2021-04-02 22:30:48 +00:00
Chris Parsons
e59af4e1c0 Use correct includes for mixed build gen headers
Previously, genrules which were used as generated_headers only
propagated the old Soong gen directory as an include path, even if the
genrule was managed by Bazel. With this chance, the gen directory of the
Baze output files are used in mixed-build mode.

Test: USE_BAZEL_ANALYSIS=1 m libc
Test: m libc
Change-Id: I3913c4e5b0354421ba1fe43d1f6ef4d1e729a058
2021-04-02 18:27:21 -04:00
Treehugger Robot
100d5d6732 Merge "Remove unused cquery requests." 2021-04-02 21:50:40 +00:00
Rupert Shuttleworth
bf94d2fdba Allow Bazel actions to see the SHELL variable.
Test: TH
Change-Id: I97ffe7ad84dfb8d58d0e6d022f73d97a73778129
2021-04-02 20:09:51 +00:00
Yi Kong
6f43f54264 Fix toc.sh, llvm-nm does not recognise '-f P' option
llvm-nm only accepts full name for format option, or just '-P' alias.

Test: build
Bug: 184360305
Change-Id: Ie25f5410403f4dbca564430149a5753e0d48d60d
2021-04-03 03:21:24 +08:00
Liz Kammer
cf58a4d272 Merge "Add depfile handling for bazel_handler." am: 5ad66aaf41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1653143

Change-Id: I67cc14fe31353fd449587cab6d056d8500b8b881
2021-04-02 17:14:07 +00:00
Liz Kammer
5ad66aaf41 Merge "Add depfile handling for bazel_handler." 2021-04-02 17:06:07 +00:00
Steven Moreland
3f34589233 Merge "Export header check allows WholeStaticLibs" am: f42daa716c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662670

Change-Id: I701cd70f484d45c3e5755e56692b8cd4ddf3d8a2
2021-04-02 16:58:12 +00:00
Ivan Lozano
c044f5bce8 rust: Update libfuzzer flags for rust_fuzz
libfuzzer-sys uses different flags in the 0.4.0 update, so update the
flags for rust_fuzz modules to align.

Test: m <example_fuzzer>
Change-Id: I0a1eb140a7843fdaf5266c05a1ecf6d3964e0f5e
2021-04-02 12:43:28 -04:00
Jaewoong Jung
f7c8d8a746 Merge "Revert "Revert "Add min_sdk_version to java_import.""" am: d0afefa4b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663082

Change-Id: I3c9fb749aa4584e158696f16a43eb2ef0f712568
2021-04-02 16:27:17 +00:00
Colin Cross
107c6aaef5 Merge "Silence kotlinc JDK9 warnings" am: 2fbc234fd6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656462

Change-Id: If91250912aec76e676ae4c0180f69e9c1c4a6e36
2021-04-02 16:10:51 +00:00
Steven Moreland
f42daa716c Merge "Export header check allows WholeStaticLibs" 2021-04-02 16:03:59 +00:00