Commit Graph

46175 Commits

Author SHA1 Message Date
Colin Cross
cfb0f5e102 Support per-testcase directories in all test suites
There are cases where two modules try to install the same test data
into CTS, which results in collisions when CTS puts the data for all
tests in the same directory.  Add a flag that allows enabling a
per-testcase directory for an individual test for all test suites.

Bug: 193168159
Test: cts-tradefed run commandAndExit CtsBionicTestCases
Change-Id: If034723e8fe937ca71d3e2d39b7d46702e41bc8c
2021-09-27 15:56:26 -07:00
Colin Cross
f3bfd02aa9 Add environment variables to cc_genrule commands
Pass the architecture, mulitlib type and native bridge state to
each variant of a cc_genrule rule as environment variables.

Bug: 200872604
Test: TestCmdPrefix
Change-Id: I39c4c2d5bbd4f4cc72a4777715db1df049345b37
2021-09-27 15:56:23 -07:00
Romain Jobredeaux
e799597782 Merge "remove redundant 'deps' section from template with 'exports' section." am: 6a779a4b50 am: 4fd093f787
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832978

Change-Id: I84e63928e9753c72556caa9ac14bfec6998e9e75
2021-09-27 21:25:03 +00:00
Romain Jobredeaux
fea48bcc8e Merge "Exclude WallpaperPicker app and pom2bp-generated BUILD files from bp2build." am: 3bafa69336 am: 572a87d1e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832976

Change-Id: I56cab28a3c17e88985e0f7b8d94e6cadc3e8be0d
2021-09-27 21:25:01 +00:00
Romain Jobredeaux
4fd093f787 Merge "remove redundant 'deps' section from template with 'exports' section." am: 6a779a4b50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832978

Change-Id: Iceb981aa52b67b17ef73d483f76c5c9b25a123de
2021-09-27 21:06:53 +00:00
Romain Jobredeaux
572a87d1e4 Merge "Exclude WallpaperPicker app and pom2bp-generated BUILD files from bp2build." am: 3bafa69336
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832976

Change-Id: I5cc98dae403f67999798ae25a1ac4c8af6bfb414
2021-09-27 21:06:50 +00:00
Romain Jobredeaux
6a779a4b50 Merge "remove redundant 'deps' section from template with 'exports' section." 2021-09-27 20:54:51 +00:00
Romain Jobredeaux
3bafa69336 Merge "Exclude WallpaperPicker app and pom2bp-generated BUILD files from bp2build." 2021-09-27 20:54:51 +00:00
Sasha Smundak
78a7449e4e Emit unconditional module load only when inherit/include is on the top level. am: 868c5e3ab2 am: eae2336050
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1835894

Change-Id: I09f2b76770d1b19ce61c544d5c66b369204f139e
2021-09-27 19:21:02 +00:00
Sasha Smundak
eae2336050 Emit unconditional module load only when inherit/include is on the top level. am: 868c5e3ab2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1835894

Change-Id: Ie70c5ab5d919878ea9a971934caf403bf6cefb15
2021-09-27 19:07:32 +00:00
Sasha Smundak
868c5e3ab2 Emit unconditional module load only when inherit/include is on the top level.
That is, when a makefile contains
```
ifneq (,$(foo))
  $(call inherit-product,module.mk)
endif
```

module.mk has to be present only if `foo` is set.

Fixes: 200163602
Test: internal
Change-Id: Ic5f10ce8d49d6b87162bfe77922bba5e2cce228b
2021-09-27 10:02:41 -07:00
Sorin Basca
87f33ea80b OpenJDK 11: Adding jdk.internal.reflect to allowed package list
As part of the migration to OpenJDK 11, sun.reflect has moved to
jdk.internal.reflect. For now we'll have both packages available
as new code uses the jdk.internal version.

Test: m
Bug: 188889082
Bug: 190791083
Change-Id: Ib03c9c8c346daebd7d97387817b506095f5ec693
2021-09-27 15:39:06 +00:00
Treehugger Robot
c618a023b0 Merge "Add more sepolicy variables to soong_config" am: 208d2962f0 am: 68e36bfa00
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826065

Change-Id: Iab3c58f780af8f39bc648574834df878177e17da
2021-09-27 11:36:05 +00:00
Treehugger Robot
68e36bfa00 Merge "Add more sepolicy variables to soong_config" am: 208d2962f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826065

Change-Id: I25a8e93236a4bc76ea5654d7e999561b477d7fc9
2021-09-27 11:20:39 +00:00
Treehugger Robot
208d2962f0 Merge "Add more sepolicy variables to soong_config" 2021-09-27 11:05:19 +00:00
Jiakai Zhang
4d0288d834 Merge "Remove updatable-bcp-packages.txt." am: a14b18fb31 am: b9e3166b14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832483

Change-Id: I25ac8f05a14b8d5b8d6d1c1036a66809b87aed74
2021-09-26 04:02:48 +00:00
Jiakai Zhang
b9e3166b14 Merge "Remove updatable-bcp-packages.txt." am: a14b18fb31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832483

Change-Id: If17f9cb0d0cef77ea2d2fc3f0ddac177f449daca
2021-09-26 03:47:03 +00:00
Jiakai Zhang
a14b18fb31 Merge "Remove updatable-bcp-packages.txt." 2021-09-26 03:34:28 +00:00
Paul Duffin
aad451451d Add ramdisk image sdk trait to cc_library_headers am: 12a0a310a7 am: 4bf3db6c1f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834876

Change-Id: I730e2421ce1a52f1a286052f68a172ecc9bda60d
2021-09-25 09:43:37 +00:00
Paul Duffin
ba851ebcac Merge "Add recovery image sdk trait to cc_library_headers" am: a02157a4b7 am: e0778ba120
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834875

Change-Id: I56c896a4e0d5a98aff772e6dafbc1c2e6039f7c2
2021-09-25 09:43:17 +00:00
Paul Duffin
98f4f04cc6 Merge "Insert imageVariantSpecificInfo between arch and link info" am: 99df906e34 am: 5e253253ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834874

Change-Id: Ib8313b39f2997e8aeff36f8c4b0b34a5069fc015
2021-09-25 09:43:10 +00:00
Paul Duffin
5e6946a373 Merge "Extract handling of image variations from target loop" am: 7af6b7062b am: fbca36d0c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834873

Change-Id: I3d0d99bd891c1ffb64214cc52c58ed56ca797182
2021-09-25 09:42:58 +00:00
Paul Duffin
4bf3db6c1f Add ramdisk image sdk trait to cc_library_headers am: 12a0a310a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834876

Change-Id: I722497159725cd4e8b913357aed161ea69357a28
2021-09-25 09:30:55 +00:00
Paul Duffin
e0778ba120 Merge "Add recovery image sdk trait to cc_library_headers" am: a02157a4b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834875

Change-Id: I60e4ae35cd9807501abd2a0a009a5efc9de62211
2021-09-25 09:30:06 +00:00
Paul Duffin
5e253253ff Merge "Insert imageVariantSpecificInfo between arch and link info" am: 99df906e34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834874

Change-Id: If7af6edbc91844e96d8132384cf98fbd926a83a7
2021-09-25 09:29:58 +00:00
Paul Duffin
fbca36d0c6 Merge "Extract handling of image variations from target loop" am: 7af6b7062b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834873

Change-Id: Ic16405a43a524784ff29e23c45567faaadc6cedd
2021-09-25 09:29:45 +00:00
Paul Duffin
12a0a310a7 Add ramdisk image sdk trait to cc_library_headers
Allows an sdk to require that a cc_library_headers module provides a
ramdisk image variant for the prebuilt.

Previously, "ramdisk_available: true" would be set in the generated
prebuilt snapshot for any sdk member that specified
"ramdisk_available: true" in the source module. This change will only
add that setting to the snapshot if the ramdisk image variant trait
was explicitly requested for a member.

Bug: 195754365
Test: m nothing
Change-Id: I21e0dd02d380beabf228a72c463fcc603c77d87f
2021-09-25 10:17:31 +01:00
Paul Duffin
a02157a4b7 Merge "Add recovery image sdk trait to cc_library_headers" 2021-09-25 09:14:21 +00:00
Paul Duffin
99df906e34 Merge "Insert imageVariantSpecificInfo between arch and link info" 2021-09-25 09:13:14 +00:00
Paul Duffin
7af6b7062b Merge "Extract handling of image variations from target loop" 2021-09-25 09:11:44 +00:00
Christopher Ferris
80feae8c69 Merge "Add two new variables to Malloc_not_svelte." am: d8fd124227 am: 51beb6b7c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1836134

Change-Id: Idbbaa09dcf64ee0d6d587d44a96f1caa0341e175
2021-09-25 02:08:46 +00:00
Christopher Ferris
51beb6b7c8 Merge "Add two new variables to Malloc_not_svelte." am: d8fd124227
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1836134

Change-Id: Ib816cc29bcc07920dca08736c301ad9429d9b84a
2021-09-25 01:54:53 +00:00
Christopher Ferris
d8fd124227 Merge "Add two new variables to Malloc_not_svelte." 2021-09-25 01:36:48 +00:00
Christopher Parsons
6906bf0a03 Merge "Add stl property support for bp2build" am: 0bb4ac55d6 am: a64586fb74
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834858

Change-Id: I3fb516234e8ee0ac5acc2abc286c4dfbad4ca823
2021-09-24 20:25:34 +00:00
Colin Cross
7c26a0cc17 Merge "Add phony name for robolectric tests" am: ffe2c918e9 am: 11a32a918b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831866

Change-Id: Iba1095458b27218ee713411f3685ce83083847cf
2021-09-24 20:25:26 +00:00
Christopher Parsons
a64586fb74 Merge "Add stl property support for bp2build" am: 0bb4ac55d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834858

Change-Id: I9c45eab96c5e62667bd78d0fa48601ab140357a0
2021-09-24 20:08:41 +00:00
Colin Cross
11a32a918b Merge "Add phony name for robolectric tests" am: ffe2c918e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831866

Change-Id: I94f283455b3ddecad3d932d7bdbdab902ff211ee
2021-09-24 20:08:33 +00:00
Christopher Parsons
0bb4ac55d6 Merge "Add stl property support for bp2build" 2021-09-24 20:01:12 +00:00
Colin Cross
ffe2c918e9 Merge "Add phony name for robolectric tests" 2021-09-24 19:51:41 +00:00
Ivan Lozano
8e6bf89beb Merge "rust: Add require_root and vendor install base" am: eabde18653 am: 4ac514ff6e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832614

Change-Id: I9304d5ec6cdd513792cf4e201a708bb5b08c571e
2021-09-24 19:05:47 +00:00
Christopher Ferris
dea6617bc5 Add two new variables to Malloc_not_svelte.
Add the srcs and header_libs for the system/core/debuggerd
change to support removing scudo code on svelte configs.

Bug: 201007100

Test: Builds.
Change-Id: Iec083dc5cbfbc63334a72e2e77a53067786a85ca
2021-09-24 11:55:51 -07:00
Ivan Lozano
4ac514ff6e Merge "rust: Add require_root and vendor install base" am: eabde18653
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832614

Change-Id: Iaac35523cc871995c525f066f4601ee3b7e2cd0f
2021-09-24 18:54:06 +00:00
Ivan Lozano
eabde18653 Merge "rust: Add require_root and vendor install base" 2021-09-24 18:39:47 +00:00
Liz Kammer
d6c2b78cd0 Merge "Refactor code for partitions c srcs" am: 46f8dbe06a am: 137044cac4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831493

Change-Id: Ifbaf9702247c72b39fbefee2ffd7e81d021a3a36
2021-09-24 18:06:00 +00:00
Chris Parsons
a967f253e6 Add stl property support for bp2build
Test: mixed_libc
Test: USE_BAZEL_ANALYSIS=1 m libbase
Change-Id: If56d4a728de3ae4022cc9dadadc9bf8b952f9eaf
2021-09-24 13:51:56 -04:00
Liz Kammer
137044cac4 Merge "Refactor code for partitions c srcs" am: 46f8dbe06a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831493

Change-Id: Ib366e45228edca439c6dd41021945e0c62a7c127
2021-09-24 17:51:11 +00:00
Colin Cross
8304a1330e Add phony name for robolectric tests
Robolectric tests are installed by Soong, which means Make doesn't
know about the install location to create the phony rules.  Add
a phony rule in Soong for now until Soong's installation rules are
fleshed out.

Bug: 184946827
Test: m SettingsRoboTests
Change-Id: I60d76474949800e1a737714d86df84eff9a92214
2021-09-24 10:41:55 -07:00
Liz Kammer
46f8dbe06a Merge "Refactor code for partitions c srcs" 2021-09-24 17:35:16 +00:00
Paul Duffin
6369622f8d Add recovery image sdk trait to cc_library_headers
Allows an sdk to require that a cc_library_headers module provides a
recovery image variant for the prebuilt.

Previously, "recovery_available: true" would be set in the generated
prebuilt snapshot for any sdk member that specified
"recovery_available: true" in the source module. This change will only
add that setting to the snapshot if the recovery image variant trait
was explicitly requested for a member.

Bug: 195754365
Test: m nothing
Change-Id: I7d79ccdec843127f7852d82b4b163021e30a79a7
2021-09-24 17:44:37 +01:00
Paul Duffin
b42fa67a47 Insert imageVariantSpecificInfo between arch and link info
Previously, the archTypeSpecificInfo included an array of
*linkTypeSpecificInfo. This change replaces that array with an array of
*imageVariantSpecificInfo which themselves contain an array of
*linkTypeSpecificInfo.

That allows the sdk snapshot to handle image variants correctly, i.e.
collate their properties, optimize their properties and then detect if
there are any image variant specific properties for any image variant
other than the CoreImageVariant ("") and report it as an error.

The latter case is treated as an error because while Soong needs to
handle image specific variants there is currently no requirement to
handle generating a prebuilt with image specific properties. A follow
up change will test the error handling.

Image specific variants are needed because the "jni_headers"
cc_library_headers module provides a number of image variants (e.g.
recovery) that are used outside the ART module. Therefore, the sdk
snapshot needs to do the same.

At the moment image variants like the recovery variant are supported by
copying the property that creates the variant (e.g. recovery_available)
through to the prebuilt but that is not safe for a couple of reasons:
1. It ignores any differences between the recovery variant and the
   other variants which could cause compatibility issues in modules
   that build against the prebuilts.
2. It marks modules in the snapshot with recovery_available even when
   they do not need it.

This change will allow follow up changes to address both those issues.

Bug: 195754365
Test: m nothing
Change-Id: I1c187d814f44b2cb7607cd43a6b215134be0faad
2021-09-24 17:32:03 +01:00