Commit Graph

46175 Commits

Author SHA1 Message Date
Paul Duffin
b1f0f2aa80 Extract handling of image variations from target loop
This separates the selection of the image variations to depend upon
from the main target loop. Follow up changes will add additional
image variations.

Bug: 195754365
Test: m nothing
Change-Id: Ia1a61b1efbc96d92cb2faf1e2c4d1c5c752b8083
2021-09-24 17:15:40 +01:00
Liz Kammer
d9885ddeae Merge "bp2build: Add support for export_.*headers props" am: 6244df2a24 am: 6fe2d9a3aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1835374

Change-Id: I7de7d9f645b2bede17a2949659309e106e4c0dcd
2021-09-24 13:44:26 +00:00
Liz Kammer
6fe2d9a3aa Merge "bp2build: Add support for export_.*headers props" am: 6244df2a24
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1835374

Change-Id: I10252c15de0bbc6691a69fb214461f6d56d000ff
2021-09-24 13:29:34 +00:00
Liz Kammer
6244df2a24 Merge "bp2build: Add support for export_.*headers props" 2021-09-24 13:13:05 +00:00
Treehugger Robot
40f81bb79a Merge "Adding jdk.internal.misc in the allowed packages" am: f3c6843b33 am: 374cc57731
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1734814

Change-Id: I7a95db269531290600ef97bb250fb6d02e87b4f6
2021-09-24 10:49:51 +00:00
Treehugger Robot
374cc57731 Merge "Adding jdk.internal.misc in the allowed packages" am: f3c6843b33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1734814

Change-Id: I44683dd3d82e28a6446e9e1278be99e3092e0f0b
2021-09-24 10:33:00 +00:00
Treehugger Robot
f3c6843b33 Merge "Adding jdk.internal.misc in the allowed packages" 2021-09-24 10:21:18 +00:00
Martin Stjernholm
5fc64d1ac8 Merge changes I957f3df8,I68986dcc am: cf6bf37d04 am: 40fc93fb3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829372

Change-Id: Ie0234dbcd05d77deb2c0d496ee3492333af598f1
2021-09-24 10:00:23 +00:00
Martin Stjernholm
40fc93fb3c Merge changes I957f3df8,I68986dcc am: cf6bf37d04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829372

Change-Id: Ifcf471f2746c1037b83c2a11b8f5120b86fd6cb2
2021-09-24 09:44:00 +00:00
Martin Stjernholm
cf6bf37d04 Merge changes I957f3df8,I68986dcc
* changes:
  Consolidate the code to resolve a deapexer module dependency.
  Propagate the dex jar path as an OptionalPath which is either valid or invalid with a message.
2021-09-24 09:32:24 +00:00
Jiakai Zhang
46eb0fd501 Remove updatable-bcp-packages.txt.
Historically, this file was used by the `--updatable-bcp-packages-file`
flag for dex2oat. The flag is no longer needed and is being deprecated.

Unfortunately, we cannot remove `permitted_packages` and all the code
related to it because we still need it for checking the module
compatibility with Q and R.

Bug: 200241946
Test: m nothing
Change-Id: Ie3be54fd47a847ba0caf627d12da76b415d99466
2021-09-24 03:19:05 +00:00
Treehugger Robot
39097a3f49 Merge "For mixed build bazel actions, remove old outputs" am: e1bb74e724 am: d17a3ad9f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834860

Change-Id: Idac0af306c269fe143fe68919c9ff285d9e733c0
2021-09-23 23:05:53 +00:00
Treehugger Robot
d17a3ad9f2 Merge "For mixed build bazel actions, remove old outputs" am: e1bb74e724
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834860

Change-Id: I32be5f8098a6161aad6d2bdabfb848fd374eeed1
2021-09-23 22:48:05 +00:00
Treehugger Robot
e1bb74e724 Merge "For mixed build bazel actions, remove old outputs" 2021-09-23 22:38:12 +00:00
Liz Kammer
57e2e7a78f Refactor code for partitions c srcs
To support protos (and other srcs that generate sources), we need to
partition further. Separate out into a separate common function.

Bug: 200601772
Test: build/bazel/ci/bp2build.sh
Change-Id: I7bf4cd96fd9a9fca4ccb3c96f21a04303201f891
2021-09-23 18:28:24 -04:00
Joel Galenson
d3e4641b76 Merge "Pass "--extern proc_macro" to rust_proc_macros." am: 33e32f3ce5 am: 8cbd0f5575
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834815

Change-Id: Ia6857fdc7d7d875b0050e3f87efb7f1c625401d0
2021-09-23 21:50:41 +00:00
Joel Galenson
8cbd0f5575 Merge "Pass "--extern proc_macro" to rust_proc_macros." am: 33e32f3ce5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834815

Change-Id: I4502f0468d3beef8d97b8e5fe134043f96b26cf9
2021-09-23 21:37:52 +00:00
Treehugger Robot
77a9edad65 [automerger skipped] Merge "Changes tree built Robolectric name" am: 40660d21f8 -s ours am: d5eadda1ee -s ours
am skip reason: Merged-In If13583f6a2882e2e78d3004afc476debf6692df9 with SHA-1 69e65b3fcd is already in history

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

Change-Id: I07a69de51ca021b434d4b15f58d0bd2ff115290c
2021-09-23 21:33:03 +00:00
Joel Galenson
33e32f3ce5 Merge "Pass "--extern proc_macro" to rust_proc_macros." 2021-09-23 21:26:22 +00:00
Chris Parsons
e37a4de773 For mixed build bazel actions, remove old outputs
This should fix incrementality issues in cases where actions don't wipe
the old output. (Looking at you, llvm-ar)

Test: mixed_libc.sh
Change-Id: I4b6639e74c72921a5a703d73fd36f766f121c6ad
2021-09-23 17:25:10 -04:00
Treehugger Robot
d5eadda1ee [automerger skipped] Merge "Changes tree built Robolectric name" am: 40660d21f8 -s ours
am skip reason: Merged-In If13583f6a2882e2e78d3004afc476debf6692df9 with SHA-1 69e65b3fcd is already in history

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

Change-Id: Ifcd614a7757c68d4ffa94ae370a06bad28df3963
2021-09-23 21:15:28 +00:00
Treehugger Robot
40660d21f8 Merge "Changes tree built Robolectric name" 2021-09-23 21:04:51 +00:00
Christopher Parsons
a7aaa6b2c6 Merge "Disable mixed builds for non-device OS" am: 4ea6052650 am: f75a32998e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834999

Change-Id: Ia9568fe67359125398966568fc89c544499ba8ac
2021-09-23 20:14:59 +00:00
Liz Kammer
7a210ac233 bp2build: Add support for export_.*headers props
Soong supports export_.*_headers properties, the libraries contained in
this list must also be within a shared/static/whole_static/header libs
property. For bp2build, we eliminate this duplication. The libraries
not listed in an export_.*_headers property will migrate to an attribute
prepended with implementation_, those in export_.*_headers will not have
a prefix.

Test: build/bazel/ci/bp2build.sh
Test: build/bazel/ci/mixed_libc.sh
Bug: 198241472
Change-Id: I3eb84c983ec5d241c8a568e411dfd5619d3184a7
2021-09-23 16:07:45 -04:00
Christopher Parsons
f75a32998e Merge "Disable mixed builds for non-device OS" am: 4ea6052650
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834999

Change-Id: I7bdd47462db00faeaa85917d47f310c17b134aae
2021-09-23 20:02:36 +00:00
Christopher Parsons
4ea6052650 Merge "Disable mixed builds for non-device OS" 2021-09-23 19:45:15 +00:00
Ivan Lozano
749ef54f2f Merge "rust: Refactor cfg and feature flag calculation" am: f96578e908 am: 18618ee803
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834996

Change-Id: I6db41b94b582f3b273cdcc6355653a85ce24072e
2021-09-23 18:42:28 +00:00
Ivan Lozano
18618ee803 Merge "rust: Refactor cfg and feature flag calculation" am: f96578e908
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834996

Change-Id: I26e2d732f33128fee681728f3efb345179ec4485
2021-09-23 18:37:34 +00:00
Wei Li
265d6f45cb Merge "Add bp2build converter for cc_genrule." am: a06db33ebd am: 0e504d7dc9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829492

Change-Id: I24ce34192858f1425ad2beede56de0cb35eb0871
2021-09-23 18:37:25 +00:00
Ivan Lozano
f96578e908 Merge "rust: Refactor cfg and feature flag calculation" 2021-09-23 18:25:22 +00:00
Wei Li
0e504d7dc9 Merge "Add bp2build converter for cc_genrule." am: a06db33ebd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829492

Change-Id: I73b0abd1f86d7dfc17a683595585aff4b5ffb91e
2021-09-23 18:17:04 +00:00
Chris Parsons
1826621bdd Disable mixed builds for non-device OS
We don't currently support propagation of OS in mixed builds, and our
host toolchains are not properly configured.

This allows us to continue to make progress on device OS until host is
supported.

Test: mixed_libc CI
Test: USE_BAZEL_ANALYSI=1 m adbd
Change-Id: I2bf8b3f9ca7928dd33bf2fb3d4fa067da0f593f3
2021-09-23 14:11:42 -04:00
Wei Li
a06db33ebd Merge "Add bp2build converter for cc_genrule." 2021-09-23 18:04:03 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
9f7ff17cd8 Merge "Annotate FIXME for b/200678898" am: fda604ab7c am: 0a72e89916
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832335

Change-Id: Ic838e795fea43573d8e4c35ed0300a899cebf76b
2021-09-23 17:37:39 +00:00
Christopher Parsons
f1aa4c30d1 Merge "cquery: obtain objects from custom provider" am: 798e8876c8 am: f49703827f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832977

Change-Id: Ie537f7e72e233a7828571f7f1ed7ee79da213464
2021-09-23 17:37:31 +00:00
Joel Galenson
ce7bbdc38a Pass "--extern proc_macro" to rust_proc_macros.
This is actually required for some code.

Test: Modify the new test so it fails and see it fail.
Test: Build crates that fail without it.
Change-Id: I527752b765e5552aa2de7e201f056955e053e1f3
2021-09-23 10:34:24 -07:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
0a72e89916 Merge "Annotate FIXME for b/200678898" am: fda604ab7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832335

Change-Id: I73c2f65504a17a0b866ccb498ba1f20fcfd2b6f8
2021-09-23 17:22:51 +00:00
Christopher Parsons
f49703827f Merge "cquery: obtain objects from custom provider" am: 798e8876c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832977

Change-Id: I373d65ce6cda16e3a17c40e877d3b014271b0488
2021-09-23 17:22:40 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
fda604ab7c Merge "Annotate FIXME for b/200678898" 2021-09-23 17:18:49 +00:00
Christopher Parsons
798e8876c8 Merge "cquery: obtain objects from custom provider" 2021-09-23 17:11:25 +00:00
Sarah Chin
18cda72b86 [automerger skipped] Merge "Add IRadio modules to VNDK" am: 1c0557ea82 -s ours am: c1932a3b2b -s ours
am skip reason: Merged-In Ia468b563c6485464db56b3c9cdbae80de6b3f165 with SHA-1 84fdadfe83 is already in history

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

Change-Id: Iade8755ea2215b1c0210fd09c3d283002e61be1f
2021-09-23 16:47:36 +00:00
Sarah Chin
c1932a3b2b [automerger skipped] Merge "Add IRadio modules to VNDK" am: 1c0557ea82 -s ours
am skip reason: Merged-In Ia468b563c6485464db56b3c9cdbae80de6b3f165 with SHA-1 84fdadfe83 is already in history

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

Change-Id: Ic43251c71b59929cff7c52e12fbf156a51c2e675
2021-09-23 16:37:53 +00:00
Sarah Chin
1c0557ea82 Merge "Add IRadio modules to VNDK" 2021-09-23 16:35:42 +00:00
Ivan Lozano
67eada34db rust: Refactor cfg and feature flag calculation
Move the cfg and feature flag calculation out of compilerFlags so that
it's a separate step.

The previous arrangement resulted in overridden compilerFlags which
must to set any additional cfgs/features before calling the base.
This is a bit confusing and undocumented behavior, so instead break
it out into a separate call that can itself be overriden.

Bug: N/A
Test: Soong tests pass
Change-Id: I28e4f707b3b3ca6eb621b7613c3737817f877bb8
2021-09-23 12:21:04 -04:00
Martin Stjernholm
4482560cc7 Consolidate the code to resolve a deapexer module dependency.
It will get more logic in upcoming CLs.

Add a property to DeapexerInfo for the APEX name, for use in error
messages.

Test: m nothing
Bug: 192006406
Change-Id: I957f3df8b34543a38cde38768dac93e78132d672
2021-09-23 17:19:55 +01:00
Martin Stjernholm
8be1e6db16 Propagate the dex jar path as an OptionalPath which is either valid or
invalid with a message.

This will allow propagating any error from the deapexer module for
prebuilt APEXes to the location where the dex jars get used. It's only
at those points that we can raise errors about not being able to
extract files from the deapexer modules if they are invalid, and this
way we avoid encoding knowledge there about why they may be invalid.

To keep the refactoring limited it intentionally does not change any of
the existing logic for when dexJarFiles are set or not (non-nil vs nil
prior to this change), although there may be opportunity to use this
for more conditions when dex jars aren't available.

The refactoring is also not extended to
dexpreopt.ClassLoaderContextMap.

Test: m nothing
Bug: 192006406
Change-Id: I68986dccd9a9b3fee4d24caa1947ea17a36caedc
2021-09-23 17:19:55 +01:00
TreeHugger Robot
48aa9cb5e1 [automerger skipped] Merge "Changes tree built Robolectric name" into stage-aosp-master am: 086cb94b7f -s ours
am skip reason: Merged-In If13583f6a2882e2e78d3004afc476debf6692df9 with SHA-1 d6d4699494 is already in history

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

Change-Id: I089af37e926a15eccc1141006bce5dab964b55b3
2021-09-23 16:12:27 +00:00
TreeHugger Robot
086cb94b7f Merge "Changes tree built Robolectric name" into stage-aosp-master 2021-09-23 15:58:22 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
fd0c03c315 Annotate FIXME for b/200678898
Bug: 200678898
Test: TBD
Change-Id: I433f3187714d5ea19b081ed5e3fe758de0a29ddd
2021-09-23 15:12:03 +00:00
Chris Parsons
9eae3cb80e cquery: obtain objects from custom provider
This prevents use of CcInfo to obtain object information, as doing so
would mean propagating linker inputs transitively up the graph (not a
feature that Soong supports)

Test: mixed_libc.sh
Change-Id: I5e5cbfb607b866bb57491dbc0693f79b71707492
2021-09-23 11:01:52 -04:00