Paul Duffin
efa0f00706
Merge "Fix the snapshot handling of generated headers"
2021-02-24 10:08:34 +00:00
Jiyong Park
1d878cac19
Merge "Add logical_partition module type" am: c1e48ac7d8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1602154
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I53eb2a49dfa54021642518e39b5c263fbf9aba75
2021-02-24 09:44:50 +00:00
Jiyong Park
c1e48ac7d8
Merge "Add logical_partition module type"
2021-02-24 09:17:28 +00:00
Christoffer Quist Adamsen
c3ae5578c9
Merge "Allow missing classes in R8 builds" am: a72571f0d1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597934
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ef29a4dab89a95ff1c98cf784044fd3b387a20b
2021-02-24 08:14:57 +00:00
Christoffer Quist Adamsen
a72571f0d1
Merge "Allow missing classes in R8 builds"
2021-02-24 07:25:18 +00:00
Treehugger Robot
035b6e6882
Merge "Move bazel.Properties to a BazelModuleBase" am: bbfd5ab606
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1591532
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I94324e03163cc36f31c6dc3d3c0d789f6b0b1fa1
2021-02-24 06:58:29 +00:00
Jingwen Chen
db12024524
bp2build: add support for cc_object's objs and exclude_srcs properties.
...
objs contains module references to other cc_objects that will be used
for linking later. This maps to cc_library deps.
Also support exclude_srcs, and added tests.
Test: bp2build generate, sync, bazel build //bionic/...
Change-Id: I21200ff73f24bcf5357d9df8dcb5519cde532a77
2021-02-24 01:08:57 -05:00
Treehugger Robot
bbfd5ab606
Merge "Move bazel.Properties to a BazelModuleBase"
2021-02-24 05:53:25 +00:00
Jiyong Park
b89e5e71b7
Add logical_partition module type
...
logical_partition builds a partition image (which is usually called
'super.img') out of one or more filesystem images.
Bug: 180921702
Test: m microdroid_super
Change-Id: I659607647e3a5bc82c82b576a049e6c6f91cbddb
2021-02-24 12:53:39 +09:00
Treehugger Robot
defa29df15
Merge "Build statsd-module-sdk-for-art" am: 7ebe464748
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597253
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0cf61d86e010e2aba450b16abbd1abbc123f628d
2021-02-24 01:43:34 +00:00
Treehugger Robot
7e3b7a1244
Merge "android:path attribute is respected for fields in a slice of struct" am: 4dc0702ce2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1602153
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic710c3ee404b9c96e2cfe4c4bfe9b3e9b0159672
2021-02-24 01:34:38 +00:00
David Srbecky
3ca18c4703
Merge "Set block-size for XZ mini-debug-info compression." am: bb96b56b0d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1573600
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic803e46b8dcce622fb9086a775e7d83ae54a20ab
2021-02-24 01:30:27 +00:00
Treehugger Robot
5ee786ff3f
Merge "Update soong copy of java binaries when Make copy is installed" am: 9a4279309f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1602454
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib831c8a9b6eed2f4da99bb51d1a2bb352ef8163a
2021-02-24 01:30:17 +00:00
Treehugger Robot
d078b18f64
Merge "Add non-fatal mode for verify_uses_libraries check." am: 7eacdbf8a6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592411
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8276176d5379094f5987d7ab2e6b5d691f8a2ee9
2021-02-24 01:30:04 +00:00
Treehugger Robot
be2383b27d
Merge "Refactor BazelTargetModule" am: 30899caf1f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596752
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I58a0889f7f8b8897ce96358f1c957f0f6f83e15a
2021-02-24 01:29:51 +00:00
Paul Duffin
9e21c8d376
Merge "Differentiate usages of word "include" in cc_sdk_test.go" am: d98f5b27e1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599157
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie2b51edc425194294a2ababe3f57af8e376fab1b
2021-02-24 01:29:08 +00:00
Paul Duffin
ea8a9eb451
Merge "Add sdk test for incorrect handling of generated headers" am: 8e46253840
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599156
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia67fb6385d9fe2587afc0d4abebb5a16be415c56
2021-02-24 01:28:58 +00:00
Paul Duffin
2e9d37bbe3
Merge "Separate versioned/unversioned testing in sdk/cc_sdk_test.go" am: d884c993dd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id7de63a6f44460d5ef14e8b1f567e31a32b4592e
2021-02-24 01:28:45 +00:00
Paul Duffin
a89d47760c
Merge "Support testing versioned/unversioned sdk Android.bp files separately" am: 036e84a767
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599154
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9af1fa93a5340c9b3ce19a2487e695f2a1aae034
2021-02-24 01:27:57 +00:00
Paul Duffin
e2db082638
Merge "Only export sysprop headers in exported sysprop include directory" am: 1dd5764a4e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1596831
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b93e3245521ecac7f2c4b9178e6cfb1d30de821
2021-02-24 01:20:12 +00:00
Treehugger Robot
d9a7dc9b57
Merge "Export aidl, proto and sysprop generated headers separately" am: 2b22365c8c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1595276
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9f6edac017de0dbb986705875ccae76ad4e83983
2021-02-24 01:14:47 +00:00
Treehugger Robot
7ebe464748
Merge "Build statsd-module-sdk-for-art"
2021-02-24 01:08:28 +00:00
Treehugger Robot
4dc0702ce2
Merge "android:path attribute is respected for fields in a slice of struct"
2021-02-24 00:54:56 +00:00
Paul Duffin
7b9e857f9f
Merge changes from topic "hiddenapi_additional_annotations" am: ece454400d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590193
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3dc56d6f0ba033a3d80655707c4acf81bccf8f2
2021-02-24 00:49:28 +00:00
Paul Duffin
f36d0e21c3
Remove duplicates in monolithic hidden API files am: 82b3fcf123
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587496
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7b6bbc33ff1bae69ca09dafafa4c65690451b5b9
2021-02-24 00:49:24 +00:00
Paul Duffin
44091b4387
Remove implicit dependency from <x> -> <x>-hiddenapi am: f8f4af8f1a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587495
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f701167d78771a53ab6e0f082a12c44871d22ec
2021-02-24 00:48:45 +00:00
David Srbecky
bb96b56b0d
Merge "Set block-size for XZ mini-debug-info compression."
2021-02-24 00:43:12 +00:00
Eric Holk
ff0529d209
Build statsd-module-sdk-for-art
...
Bug: 178236337
Test: build-mainline-modules.sh
Change-Id: I51dab13416be8ea1cd65234d560d84ca89b53e13
2021-02-23 22:49:57 +00:00
Treehugger Robot
9a4279309f
Merge "Update soong copy of java binaries when Make copy is installed"
2021-02-23 21:35:20 +00:00
Treehugger Robot
7eacdbf8a6
Merge "Add non-fatal mode for verify_uses_libraries check."
2021-02-23 20:45:42 +00:00
Treehugger Robot
30899caf1f
Merge "Refactor BazelTargetModule"
2021-02-23 20:40:23 +00:00
Colin Cross
44b85d01c9
Update soong copy of java binaries when Make copy is installed
...
m <modulename> is handled by Make and installs the Make copy of a host
java binary in out/host/linux-x86/bin, and doesn't depend on the Soong
copy in out/soong/host/linux-x86/bin. That can leave a stale binary
in the Soong directory, and since the Soong directory is first in the
path set up by envsetup.sh, can result in confusing behavior to end
users.
cc_binary already has the Make binary depend on the Soong binary
so that they are both updated. Do the same for java_binary.
Fixes: 180405155
Test: m metalava
Change-Id: Ic84a131a2851cc4a18ce3725da3c4067137d6120
2021-02-23 11:19:57 -08:00
Jiyong Park
66dd5c09e2
android:path attribute is respected for fields in a slice of struct
...
This change fixes a bug that android:path attribute is ignored when
annotated field is in a slice of struct.
blueprint now traverses fields whose type is slice of struct and
provides the index list in the case. Soong is modified so that it checks
whether the field being referenced is a slice of struct or not. If that
is the case, it gathers field values from each of the elements. If not,
it follows the original path.
Bug: 181018147
Test: m nothing
Change-Id: I220efb6feaa525a00939654459b2998e98e7ad56
2021-02-24 01:22:57 +09:00
Liz Kammer
ea6666fba9
Move bazel.Properties to a BazelModuleBase
...
This allows more direct access to the bazel label and whether the module
is bp2build available.
Test: go test *
Change-Id: I23375835d20fa53d7d94127b2dc2d5bb20487bfb
2021-02-23 10:58:57 -05:00
Paul Duffin
d98f5b27e1
Merge "Differentiate usages of word "include" in cc_sdk_test.go"
2021-02-23 15:29:47 +00:00
Paul Duffin
8e46253840
Merge "Add sdk test for incorrect handling of generated headers"
2021-02-23 15:29:39 +00:00
Paul Duffin
d884c993dd
Merge "Separate versioned/unversioned testing in sdk/cc_sdk_test.go"
2021-02-23 15:29:29 +00:00
Paul Duffin
036e84a767
Merge "Support testing versioned/unversioned sdk Android.bp files separately"
2021-02-23 15:29:20 +00:00
Paul Duffin
1dd5764a4e
Merge "Only export sysprop headers in exported sysprop include directory"
2021-02-23 15:28:26 +00:00
Jeffrey Vander Stoep
0d2bc64075
Merge "Setup ANDROID_RUST_VERSION env variable" am: 22af74eafd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597935
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7993b91eed86d0811f10c20dde09741e4394e22c
2021-02-23 15:17:50 +00:00
Treehugger Robot
2b22365c8c
Merge "Export aidl, proto and sysprop generated headers separately"
2021-02-23 14:11:24 +00:00
Liz Kammer
fc46bc1ee4
Refactor BazelTargetModule
...
This eliminates the need to remove quotes, delete attributes, and
re-checking that name has correct prefix. Additionally, this allows
assignment directly to the BazelTargetModuleProperties struct, which
allows defaulting unused fields and clarity of which field is being set.
Test: go test soong tests
Test: ran ./build/bazel/scripts/milestone-2/demo.sh
Change-Id: Ia9bfcce76234c793a4ddd5f29a661150f83341c9
2021-02-23 08:29:40 -05:00
Paul Duffin
ece454400d
Merge changes from topic "hiddenapi_additional_annotations"
...
* changes:
Sort hiddenapi monolithic files by signature
Remove duplicates in monolithic hidden API files
Remove implicit dependency from <x> -> <x>-hiddenapi
2021-02-23 12:48:24 +00:00
Jeffrey Vander Stoep
22af74eafd
Merge "Setup ANDROID_RUST_VERSION env variable"
2021-02-23 10:10:06 +00:00
TreeHugger Robot
4191ec7529
Merge "Merge ab/7061308 into stage." into stage-aosp-master
2021-02-23 08:43:12 +00:00
Treehugger Robot
2cf358677b
Merge "Fix infinite recursion when printing unrecognized linktype" am: f0f152484b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1600834
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6bf67cf22a8547fe9cabf7f4f2f54a7045cbf980
2021-02-23 08:09:24 +00:00
Jingwen Chen
8bc5edc91d
Merge "bp2build: Unexport GenerateBazelTargetsForDir." am: 0d2497088c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1598094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib8991cb26dc54ad1e279baa420edb8d08b016ac9
2021-02-23 04:34:13 +00:00
Treehugger Robot
f0f152484b
Merge "Fix infinite recursion when printing unrecognized linktype"
2021-02-23 04:24:14 +00:00
Jiyong Park
d4cbf34032
Fix infinite recursion when printing unrecognized linktype
...
Bug: N/A
Test: remove some cases from String() so that some linktypes go to the
default path. Then run m nothing. No infinite recursion. Error is
correctly shown.
PANIC=String method: unrecognized linktype: 5
Change-Id: I424755bc89871fc2144ff22d6391f57157cd434d
Change-Id: Ice791025dc50f44ffabd1050bafc5ea35023d32c
2021-02-23 04:02:23 +00:00
Jingwen Chen
0d2497088c
Merge "bp2build: Unexport GenerateBazelTargetsForDir."
2021-02-23 03:07:00 +00:00