Commit Graph

8199 Commits

Author SHA1 Message Date
Colin Cross
59f957abbf Merge "Revert "Export SOONG_CC_API_XML to Make outside androidmk"" am: 6f37dba455
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841188

Change-Id: I84b0b1e723313f4749e6d37a989b1e3c88b140d8
2021-09-30 03:39:08 +00:00
Colin Cross
2cec05d37b Revert "Export SOONG_CC_API_XML to Make outside androidmk"
This reverts commit ebb32c486a.

Reason for revert: breaks coverage build (b/201600003)
Bug: 193819970
Bug: 201600003

Change-Id: I65969c4a62165c40dded2794b757469909bf8ca6
2021-09-30 03:14:40 +00:00
Colin Cross
1b0be52c34 Merge "Export SOONG_CC_API_XML to Make outside androidmk" am: 1cd6d8e25e am: 7dddc5adb5 am: 958e95c348 am: 81895f9b11 am: 23b46e2765
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1838396

Change-Id: Idbcea78882002d2066ab20017b102ffae6cca084
2021-09-30 00:28:10 +00:00
Colin Cross
7dddc5adb5 Merge "Export SOONG_CC_API_XML to Make outside androidmk" am: 1cd6d8e25e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1838396

Change-Id: Id1d458966726c4fda22f0558bb54e9f07738aab1
2021-09-29 23:30:29 +00:00
Colin Cross
ebb32c486a Export SOONG_CC_API_XML to Make outside androidmk
The SOONG_CC_API_XML values are needed for modules that are not
exported to Make, export them from a singleton that covers all
modules instead of an AndroidMkProvider that may not be called
for some modules.

Bug: 193819970
Test: manual
Change-Id: Ie0a945d879de4f99ce76d005aea8041719c244f7
2021-09-28 16:39:13 -07:00
Colin Cross
c8caa06a36 Add data_bins property
data_bins is similar to data_libs but copies helper binaries alongside
the test.

Bug: 200872604
Test: atest CtsBionicTestCases
Change-Id: I4f9df5f82816cfd30a0a19808fda220cf77c50a7
2021-09-27 15:56:26 -07:00
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
Paul Duffin
822526e45c Add ramdisk image sdk trait to cc_library_headers am: 12a0a310a7 am: 4bf3db6c1f am: aad451451d am: cbe946572b am: 199a532e35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834876

Change-Id: I5f5cf15b0cb3ec8d9bb1428cc71d7f7b8bb60c36
2021-09-25 10:25:15 +00:00
Paul Duffin
229892e0f0 Merge "Add recovery image sdk trait to cc_library_headers" am: a02157a4b7 am: e0778ba120 am: ba851ebcac am: 3d5a2b5966 am: afb57712b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834875

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

Change-Id: Idf8010ff860fe66fb2d1268fe7ac04fa04ff46b8
2021-09-25 10:24:10 +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
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
7af6b7062b Merge "Extract handling of image variations from target loop" 2021-09-25 09:11:44 +00:00
Christopher Parsons
46554bbfd1 Merge "Add stl property support for bp2build" am: 0bb4ac55d6 am: a64586fb74 am: 6906bf0a03 am: ed4637d406 am: 1b6d69ac04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834858

Change-Id: Iaf8b095a182f4cdc8509f64de2ced0cef6792a70
2021-09-24 21:12:31 +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
Christopher Parsons
0bb4ac55d6 Merge "Add stl property support for bp2build" 2021-09-24 20:01:12 +00:00
Liz Kammer
37c7d4b166 Merge "Refactor code for partitions c srcs" am: 46f8dbe06a am: 137044cac4 am: d6c2b78cd0 am: ef5014a816 am: 1a9291a026
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831493

Change-Id: Id760c9ca6fc2df84055f17430fdbcc73ece6a62c
2021-09-24 18:53:10 +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
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
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
a7e723f2be Merge "bp2build: Add support for export_.*headers props" am: 6244df2a24 am: 6fe2d9a3aa am: d9885ddeae am: 106fdb6b05 am: 571eb75027
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1835374

Change-Id: I67ec24e7d6f908abc09e816cf543190a38899950
2021-09-24 14:13:51 +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
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
Christopher Parsons
dec1f0b476 Merge "Disable mixed builds for non-device OS" am: 4ea6052650 am: f75a32998e am: a7aaa6b2c6 am: fa6094881b am: 1aab03d1aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834999

Change-Id: I109c03a784514825fee78098e384926ff96da334
2021-09-23 20:53:58 +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
Wei Li
ca73ea08ef Merge "Add bp2build converter for cc_genrule." am: a06db33ebd am: 0e504d7dc9 am: 265d6f45cb am: f317be48d3 am: bcc53480b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829492

Change-Id: If8e114a287530071d9bc5dfccac42f85028a6371
2021-09-23 19:32:10 +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
Sarah Chin
1c0557ea82 Merge "Add IRadio modules to VNDK" 2021-09-23 16:35:42 +00:00
Paul Duffin
753c8a180c Merge "Add support for native bridge trait" am: 15e92388bb am: 8aae014264 am: f260c92e1f am: 2078d0d9c7 am: 33119df075
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827878

Change-Id: I61e8207339c5f637cdf55ca397ea70d1641a251a
2021-09-23 13:59:52 +00:00
Paul Duffin
8aae014264 Merge "Add support for native bridge trait" am: 15e92388bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827878

Change-Id: I286209ee993de44cc508ca9449e73a55846dac33
2021-09-23 13:03:35 +00:00
Paul Duffin
93b750e2a0 Add support for native bridge trait
Adds a native bridge trait that if required will cause a
cc_library_header module to generate a cc_prebuilt_library_headers with
native_bridge_supported: true. It will fail if the cc_library_header's
native bridge variant would produce native bridge specific properties,
distinct from the other architecture variants, in the generated
cc_prebuilt_library_headers.

Bug: 195754365
Test: m nothing
Change-Id: I282fbb9095de6c6af57cca4eb4260e2c6c2da8cc
2021-09-23 11:37:57 +01:00
Wei Li
bcd399479a Add bp2build converter for cc_genrule.
Test: cc_genrule_conversion_test.go

Change-Id: I19290b417d6336020a15ba7fa772ee0c76c58225
2021-09-23 05:41:20 +00:00
Sarah Chin
25d84c6e68 Merge "Add IRadio modules to VNDK" into stage-aosp-master am: ef3dd96890 am: d1cbc6eab0 am: bad9470ae7 am: c9ccb50257
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15881182

Change-Id: Id673ab33f495a3ccb7631cf41a4c699aba0b5aa8
2021-09-23 03:57:07 +00:00
Sarah Chin
0322af503a Add IRadio modules to VNDK
Test: build
Bug: 198331451
Change-Id: Ia468b563c6485464db56b3c9cdbae80de6b3f165
Merged-In: Ia468b563c6485464db56b3c9cdbae80de6b3f165
2021-09-23 03:54:58 +00:00
Sarah Chin
ef3dd96890 Merge "Add IRadio modules to VNDK" into stage-aosp-master 2021-09-23 02:58:32 +00:00
Treehugger Robot
52127ab1a5 Merge "Revert "update build rules to use /data/local/tests/unrestricted"" am: 512ec3f4fe am: dfcb3ff691 am: bd515c314c am: 0c398d1a10 am: 06345fde9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832958

Change-Id: Ib567676638490992e462a9d431a8fc72b77c8573
2021-09-22 07:37:06 +00:00
Treehugger Robot
dfcb3ff691 Merge "Revert "update build rules to use /data/local/tests/unrestricted"" am: 512ec3f4fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832958

Change-Id: I1f99bcbca475bd29e165f735706cd2b3d913c113
2021-09-22 06:45:42 +00:00
Sarah Chin
84fdadfe83 Add IRadio modules to VNDK
Test: build
Bug: 198331451
Change-Id: Ia468b563c6485464db56b3c9cdbae80de6b3f165
2021-09-21 23:34:20 -07:00
Treehugger Robot
512ec3f4fe Merge "Revert "update build rules to use /data/local/tests/unrestricted"" 2021-09-22 06:33:44 +00:00
Guang Zhu
5c97bc698f Revert "update build rules to use /data/local/tests/unrestricted"
Revert submission 1826231-native-test-path

Reason for revert: b/199996863

Bug: 199996863

Reverted Changes:
Ic106011a7:update build rules to use /data/local/tests/unrest...
Id727355ec:update build rules to use /data/local/tests/unrest...

Change-Id: Id53334a6169e58964ef86e78de738f29b32dd491
2021-09-22 04:20:22 +00:00
Treehugger Robot
0f7dddcc9c Merge "[IRadioConfig] Add to VNDK variant list" 2021-09-22 01:49:23 +00:00