Commit Graph

28679 Commits

Author SHA1 Message Date
Anton Hansson
2a54e56ef9 Merge "Make apex modules support tagged dists" am: fabdd28fdb am: afe209bdad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1496336

Change-Id: If5928370895562efbb392a751978a716dcbb6418
2020-11-12 09:35:55 +00:00
Anton Hansson
afe209bdad Merge "Make apex modules support tagged dists" am: fabdd28fdb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1496336

Change-Id: Icc629fc71d06bec56e7eb04e14aa369741239e2f
2020-11-12 09:01:20 +00:00
Anton Hansson
fabdd28fdb Merge "Make apex modules support tagged dists" 2020-11-12 08:30:55 +00:00
Zach Johnson
fe02bb74e7 Merge "rust_grpcio well known types support, default deps" am: c0ea1701cb am: 1ec2ec156f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1490423

Change-Id: Ib39e68aeb456a22cfbbf1b68e0a4aca569fb2204
2020-11-12 00:28:47 +00:00
Zach Johnson
1ec2ec156f Merge "rust_grpcio well known types support, default deps" am: c0ea1701cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1490423

Change-Id: I0a26238b9edea981c7076df2958ff20422d3d091
2020-11-12 00:04:55 +00:00
Zach Johnson
c0ea1701cb Merge "rust_grpcio well known types support, default deps" 2020-11-11 23:22:27 +00:00
Rupert Shuttleworth
33d5e57713 Merge "Perform Bazel cleanup using "--batch --max_idle_secs=1" instead of a trap." am: eb165fd950 am: d8b257c7a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1493518

Change-Id: Iab7c706265f2f2803c37f88ade03b433b875d863
2020-11-11 21:47:09 +00:00
Rupert Shuttleworth
d8b257c7a1 Merge "Perform Bazel cleanup using "--batch --max_idle_secs=1" instead of a trap." am: eb165fd950
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1493518

Change-Id: I1f7a496e0a2132198da7c965546f48f61e52aabd
2020-11-11 21:30:36 +00:00
Rupert Shuttleworth
eb165fd950 Merge "Perform Bazel cleanup using "--batch --max_idle_secs=1" instead of a trap." 2020-11-11 20:56:10 +00:00
Zach Johnson
3df4e6364b rust_grpcio well known types support, default deps
The usage of the well known type Empty requires a hack in the module
above the grpc implementation, this is now the generated stem_mod.rs

This also adds additional implicit dependencies that are required by
the grpc protobuf generated code. This includes the addition of a
'header_libs' property for library dependencies which export include
paths required by protos.

We also now include both the protos and the grpcio in the library
variant via the mod_stem.rs.

Bug: 172592789
Bug: 171504899
Test: m nothing
Test: Example rust_grpcio module build command includes dependencies,
      include paths.
Change-Id: I187a13cd5cdea991828a1020314de16727e4f74e
2020-11-11 12:09:26 -08:00
Paul Duffin
d54bddbda2 Merge "Switch boot jars package check to using dex jars" am: 68ecbaf614 am: aa50b67217
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479315

Change-Id: I2ea49b028aaeadf31a8552bcae158ba837136722
2020-11-11 13:59:03 +00:00
Paul Duffin
aa50b67217 Merge "Switch boot jars package check to using dex jars" am: 68ecbaf614
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479315

Change-Id: I625ce32e7d0fcdcdeeb70a1960d9aa19c955a17b
2020-11-11 13:08:58 +00:00
Paul Duffin
68ecbaf614 Merge "Switch boot jars package check to using dex jars" 2020-11-11 12:53:23 +00:00
Anton Hansson
82d502a7b2 Make apex modules support tagged dists
Bug: 172951145
Test: m dist my_dist_target (with patch in bug)
Change-Id: I0da4568a49ea48efbf864614a7e7c647f251a7ce
2020-11-11 12:34:20 +00:00
Mathew Inwood
1c7d02ef58 Merge "Temporarily move APIs to blocked list." am: 82d5b6726b am: 1917bee275
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1494179

Change-Id: I08d69aa8fce79210e28143f655ef235062f71092
2020-11-11 09:59:06 +00:00
Mathew Inwood
1917bee275 Merge "Temporarily move APIs to blocked list." am: 82d5b6726b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1494179

Change-Id: Ic84c50eb4cbf2be78dc2ffeee3125779e10d5c7e
2020-11-11 09:32:43 +00:00
Mathew Inwood
82d5b6726b Merge "Temporarily move APIs to blocked list." 2020-11-11 09:13:48 +00:00
Paul Duffin
4fc198029d Merge "Remove support for droidstubs in sdk/module_exports" am: 99a7622885 am: 14301ccfd1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1492857

Change-Id: I03a10b15bb676d98539241fbaed3181603bd7a23
2020-11-10 19:14:51 +00:00
Paul Duffin
14301ccfd1 Merge "Remove support for droidstubs in sdk/module_exports" am: 99a7622885
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1492857

Change-Id: I6d37857cc9cdcec8249b7ccd4917936a77efa850
2020-11-10 18:42:41 +00:00
Paul Duffin
2d8e1a7e59 Switch boot jars package check to using dex jars
The switch to use dex jars instead of class jars means that a boot jar
that is defined by a dex_import module will now be checked against the
package_allowed_list.txt so it is possible that it will detect
previously unreported problems.

Test: m check-boot-jars - for failing and passing cases
Bug: 171479578
Bug: 125517186
Change-Id: Ie614898dade0fb43c9418d7afb9138169db6f097
2020-11-10 17:37:43 +00:00
Paul Duffin
99a7622885 Merge "Remove support for droidstubs in sdk/module_exports" 2020-11-10 17:34:00 +00:00
Anton Hansson
ab2ebb04ba Merge "Remove dead code" am: a1b3314286 am: 00d7ec3375
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1488756

Change-Id: I310a8a21958f0500aaa2d4f4bac535115829c8c7
2020-11-10 15:19:35 +00:00
Anton Hansson
00d7ec3375 Merge "Remove dead code" am: a1b3314286
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1488756

Change-Id: I4a6eed71a609eef6f01a39b3487270833af31615
2020-11-10 14:49:21 +00:00
Paul Duffin
a3f456e3d0 Merge "Use glob for java_sdk_library_import stub_srcs" am: 37fa489a9e am: 0b578e9241
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1492856

Change-Id: Icd5c0c037bd9c45a8be93b3f7608b20aea583ab6
2020-11-10 14:40:35 +00:00
Treehugger Robot
56e6dbb9c9 Merge "Rust bindgen should use r399163b." am: 13c1df6a2f am: dcb4b40201
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1493281

Change-Id: I02289c112408b9628d2f2c6e4fbf458c0c42b721
2020-11-10 14:40:24 +00:00
Anton Hansson
a1b3314286 Merge "Remove dead code" 2020-11-10 14:35:13 +00:00
Paul Duffin
0b578e9241 Merge "Use glob for java_sdk_library_import stub_srcs" am: 37fa489a9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1492856

Change-Id: Ie98d496daed02eecf6d17d9c27da4951bdeebe0b
2020-11-10 14:02:35 +00:00
Treehugger Robot
dcb4b40201 Merge "Rust bindgen should use r399163b." am: 13c1df6a2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1493281

Change-Id: Ic52596d266cc33ce414ea2937c4bb0b82433047f
2020-11-10 14:01:49 +00:00
Paul Duffin
a3cb6cf2e5 Remove support for droidstubs in sdk/module_exports
The droidstubs support in sdk/module_exports was a temporary measure
to work around the fact that some APIs were being defined by direct use
of droidstubs instead of java_sdk_library.

This change removes that support as those APIs have all been switched
from droidstubs to use java_sdk_library so droidstubs support is no
longer needed.

Bug: 168301990
Test: m nothing
Change-Id: I3517bed29b030438a0423a6cb8c248992a988222
2020-11-10 13:55:17 +00:00
Paul Duffin
37fa489a9e Merge "Use glob for java_sdk_library_import stub_srcs" 2020-11-10 13:54:23 +00:00
Treehugger Robot
13c1df6a2f Merge "Rust bindgen should use r399163b." 2020-11-10 13:42:40 +00:00
Mathew Inwood
59093e3769 Temporarily move APIs to blocked list.
Bug: 170729553
Test: m

Change-Id: I62db78941785fd1bd336cfe81c8e9763e08a0eb0
2020-11-10 13:08:58 +00:00
Treehugger Robot
d4dd93b090 Merge "Allow extra startup and build args to be passed to Bazel." am: ccd3f1d66f am: 0c7f3f741f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1493517

Change-Id: Ie74c7527fec3be576c769b07fec6594ba94149ac
2020-11-10 08:18:57 +00:00
Treehugger Robot
0c7f3f741f Merge "Allow extra startup and build args to be passed to Bazel." am: ccd3f1d66f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1493517

Change-Id: I2c79e37b6e7a63468e318652a8737d791e0adf6d
2020-11-10 08:04:12 +00:00
Treehugger Robot
dc617c8ec4 Merge "add -nostdlibinc for arm64_linux_host" am: 8b16e407e2 am: 44261ca8a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1493896

Change-Id: Ib8e0833be107abea6fc2e8186885ee129789b289
2020-11-10 07:29:51 +00:00
Treehugger Robot
ccd3f1d66f Merge "Allow extra startup and build args to be passed to Bazel." 2020-11-10 07:22:34 +00:00
Treehugger Robot
44261ca8a2 Merge "add -nostdlibinc for arm64_linux_host" am: 8b16e407e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1493896

Change-Id: Ifd8fecebfd8e3af04c015e5481103dcb82df76eb
2020-11-10 07:13:01 +00:00
Treehugger Robot
8b16e407e2 Merge "add -nostdlibinc for arm64_linux_host" 2020-11-10 06:52:07 +00:00
Kiyoung Kim
de9329e680 Merge "Add new properties in linker config format - provideLibs and requireLibs" am: 9ce4eec815 am: b16e8feb42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1468883

Change-Id: I7ec9be6398964cce376cd2c292eeae475e231958
2020-11-10 06:51:05 +00:00
Kiyoung Kim
b16e8feb42 Merge "Add new properties in linker config format - provideLibs and requireLibs" am: 9ce4eec815
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1468883

Change-Id: Ied795fcdc6c9c523de3edab24f6e683959250919
2020-11-10 06:08:52 +00:00
Kiyoung Kim
9ce4eec815 Merge "Add new properties in linker config format - provideLibs and requireLibs" 2020-11-10 05:49:35 +00:00
Jingwen Chen
117ee27f47 Mark queryview as experimental in the Ninja description. am: b05d62f584 am: f246c08e9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1492696

Change-Id: I804c40e9465f1113100546356cba46682c26cdf6
2020-11-10 03:16:36 +00:00
Jingwen Chen
f246c08e9e Mark queryview as experimental in the Ninja description. am: b05d62f584
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1492696

Change-Id: I12079d602c8bc983509b1df0610066afefaae829
2020-11-10 02:57:28 +00:00
Jiyong Park
b304e805d9 add -nostdlibinc for arm64_linux_host
The flag is needed to prevent the compiler from looking into the host
include paths like /usr/include.

Bug: 172869346
Test: inspect the include path by temporarily adding `-v`.
Change-Id: I73a16155a784916a1bd0babcb75d5f9079e13423
2020-11-10 11:55:42 +09:00
Rupert Shuttleworth
2e5bf406f1 Perform Bazel cleanup using "--batch --max_idle_secs=1" instead of a trap.
Test: Manually.
Change-Id: Id28f504fec8c6f7222646fe822264f0a4a746825
2020-11-10 02:37:24 +00:00
Rupert Shuttleworth
f8ae317d3e Allow extra startup and build args to be passed to Bazel.
For example: USE_BAZEL=1 BAZEL_STARTUP_ARGS="--batch" m

Test: Manually.
Change-Id: I76fa8e17d4a9ccb8dda9fca049113f434dacabbe
2020-11-10 02:06:30 +00:00
Stephen Hines
a3faafa377 Rust bindgen should use r399163b.
Bug: http://b/155835175
Test: m
Change-Id: Iedccd3c2258fab5f9fb1034aace7d07da833a0ec
2020-11-09 16:28:23 -08:00
Paul Duffin
7f97957ded Use glob for java_sdk_library_import stub_srcs
Some java_sdk_library modules do not have any stubs for some API
scopes. That results in an empty ".srcjar" being created for them which
ends up not creating a directory for the stubs sources when that
snapshot is unzipped. Previously, that would cause a build failure as
the generated java_sdk_library_import module used the directory, which
did not exist, in its stub_srcs property.

This change switches the stubs_srcs property to use a glob pattern of
"**/*.java" relative to the directory instead of using the directory
directly. When the directory does not exist the glob pattern is
resolved to an empty set of paths and does not break the build.

Bug: 172811712
Test: Add sdkextensions-sdk sdk module (local patch)
      m sdk-extensions (local patch)
      unpack generated snapshot
      m nothing - results in build failure due to missing directory
      Make this change and repeat above except this time the build works.
Change-Id: I691ffbfdc01ba89bbcaf647dcbb7dfebc3c8aec2
2020-11-09 17:42:52 +00:00
Nikita Ioffe
aed3c6b7b7 Update apex/allowed_deps.txt
Test: presubmit
Bug: 172791253
Merged-In: I5f3d834687121ba967d1e3aeb301c87679b2078d
Change-Id: I46549088749604c42390bb27e59f61edd25149d6
2020-11-09 15:23:27 +00:00
Jingwen Chen
e999b57b25 Add TODO bug number to stop hardcoding 'droid' am: 8024c95ecc am: f456f13bfb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1491559

Change-Id: I8485d08426154f112e7ce5793df7acc15b0ecede
2020-11-09 13:38:17 +00:00