Commit Graph

27726 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Jingwen Chen
b05d62f584 Mark queryview as experimental in the Ninja description.
Test: m queryview
Signed-off-by: Jingwen Chen <jingwen@google.com>
Change-Id: I08cd5175416013c13ad150885bb918342e79fcff
2020-11-09 08:22:51 -05:00
Jingwen Chen
f456f13bfb Add TODO bug number to stop hardcoding 'droid' am: 8024c95ecc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1491559

Change-Id: I8c048e5b59146635fc20c57cf8c5c4c62038eaa5
2020-11-09 13:01:27 +00:00
Jingwen Chen
8024c95ecc Add TODO bug number to stop hardcoding 'droid'
Test: N/A
Signed-off-by: Jingwen Chen <jingwen@google.com>
Change-Id: I0d60cc4254b3a358085d89e443bd3bfc33b68ed3
2020-11-09 07:03:56 +00:00
Treehugger Robot
779adff9e6 Merge "Define product_available property" am: 25b0780f37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479576

Change-Id: Id25f3e3c79ef945045fef208024f1a721b2bb2ce
2020-11-09 05:35:39 +00:00
Matthew Maurer
13a4ae9c7b Merge "rust: Fix GRPC generator invocation" am: 40c9798e92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1489600

Change-Id: I6e1bdf519b3c3f10538eeb1c2425be70929d6d56
2020-11-09 05:35:29 +00:00
Lukács T. Berki
5dc5862fb2 Merge "Teach Soong to use a custom Delve binary." am: a40c817727
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1490596

Change-Id: I26c200522c12013fdb4b0f5e8d917babba98e0b4
2020-11-09 05:35:21 +00:00
Nikita Ioffe
0f6410aeae Merge "Update apex/allowed_deps.txt" am: 3862cd509b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1489477

Change-Id: I80f8b61fd6ffb9217ca90c6999f844e2dbdf92d5
2020-11-09 05:34:45 +00:00
Treehugger Robot
25b0780f37 Merge "Define product_available property" 2020-11-09 00:40:50 +00:00
Justin Yun
63e9ec70bb Define product_available property
To make a module available to product variants, it must define
`product_available: true`. `vendor_available: true` will not create
product variants any more.
However, in this CL, we don't change the behavior of
`vendor_available` property. It still creates both variants. After we
update all Android.bp files that need to provide product variants
with `product_available: true`, we may upload the remaining patches.

Bug: 150902910
Test: lunch aosp_arm64-userdebug && m
Change-Id: I0fd5be7bbae2c45d5cab3c3c2ca49f53a9b6f975
2020-11-08 23:53:22 +00:00
Matthew Maurer
40c9798e92 Merge "rust: Fix GRPC generator invocation" 2020-11-06 19:04:16 +00:00
Lukács T. Berki
a40c817727 Merge "Teach Soong to use a custom Delve binary." 2020-11-06 13:58:08 +00:00
Nikita Ioffe
3862cd509b Merge "Update apex/allowed_deps.txt" 2020-11-06 12:46:39 +00:00
Lukacs T. Berki
848e00edc0 Teach Soong to use a custom Delve binary.
If SOONG_DELVE_PATH=<path> is set, Soong will use that as the path to
dlv. Otherwise, it will use the one on $PATH as usual.

Test: Manual.
Change-Id: Id4334f05d077a911750f601865bd3096d852d69c
2020-11-06 10:46:01 +01:00
Jingwen Chen
a153289604 Merge "Rename bazel overlay to queryview." am: 1a3922bf09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1488619

Change-Id: I00a4a8b65d4163a2b92ee1a000388f9af83153f0
2020-11-06 07:58:04 +00:00
Jingwen Chen
1a3922bf09 Merge "Rename bazel overlay to queryview." 2020-11-06 07:56:26 +00:00
Thiébaud Weksteen
c0d8ab304c Merge changes from topic "roll-rust-1.47.0" am: 567f46fe63
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1486077

Change-Id: I5166cdc40d5ac2d1b7a904b0eb355b91a45ab237
2020-11-06 07:52:09 +00:00
Thiébaud Weksteen
567f46fe63 Merge changes from topic "roll-rust-1.47.0"
* changes:
  Use Rust 1.47.0 prebuilts
  rust: set STD_ENV_ARCH
2020-11-06 07:28:42 +00:00
Treehugger Robot
92362376bd Merge "Phase out Legcay GSI" am: aa17c4c9ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1485816

Change-Id: Ida7dc8a17282877ed96316959335611728cdb636
2020-11-06 04:19:31 +00:00
Treehugger Robot
aa17c4c9ff Merge "Phase out Legcay GSI" 2020-11-06 04:00:40 +00:00
Liz Kammer
94d609e59c Merge "Consolidate python version properties in mutator" am: 4e4798b7c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1482796

Change-Id: Ic781a8d8fb25b5f4fba7218ac2f0b5041f882814
2020-11-06 02:12:19 +00:00
Matthew Maurer
5819e58fdc rust: Fix GRPC generator invocation
When using the grpc generator, the plugin expects to also have access to
the protobuf generator. This patch ensures that aprotoc will use the
Soong copy of the protobuf generator, rather than trying to use a
locally installed version from PATH.

Test: m nothing
Change-Id: I26da4d18c97017da7d8cd9515a07a2b7b2575342
2020-11-06 01:40:41 +00:00
Liz Kammer
4e4798b7c1 Merge "Consolidate python version properties in mutator" 2020-11-06 01:29:25 +00:00
Jingwen Chen
f0eb5c9bfb Merge "bazel overlay: fix regression to "list of string" bpdocs type." am: b0a713acf9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1488618

Change-Id: I1d2fffa720bf87ded7666ad6f9b4ca7df711d003
2020-11-06 00:22:58 +00:00
Jingwen Chen
50f93d2078 Rename bazel overlay to queryview.
Bazel overlay is an experimental feature. This renames the feature to 'queryview' to better describe its purpose, and also move away from the already overloaded 'overlay' term in Android.

Test: m queryview && bazel query --package_path=out/soong/queryview //...
Change-Id: I8b5068c7db46cb61a03a8e87af9c7c9077ebeff9
2020-11-05 19:17:14 -05:00
Jingwen Chen
b0a713acf9 Merge "bazel overlay: fix regression to "list of string" bpdocs type." 2020-11-06 00:04:04 +00:00
Nikita Ioffe
77e1d4b4e5 Update apex/allowed_deps.txt
Bug: 171330443
Bug: 171668006
Test: build/soong/scripts/update-apex-allowed-deps.sh
Change-Id: I5f3d834687121ba967d1e3aeb301c87679b2078d
Merged-In: I5f3d834687121ba967d1e3aeb301c87679b2078d
2020-11-05 21:46:26 +00:00
Treehugger Robot
35cbb262e1 Merge "rust_bindgen: respect custom OUT_DIR" am: f5b2a5feb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1488500

Change-Id: I9825e1e7eb01d4fc42de8600c97e55c4c695b9a5
2020-11-05 20:16:14 +00:00
Treehugger Robot
f5b2a5feb7 Merge "rust_bindgen: respect custom OUT_DIR" 2020-11-05 19:54:46 +00:00
Ivan Lozano
5cfcc80818 Merge "Add rust_grpcio module type." am: 86a1db7baf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1483684

Change-Id: I65ee02019464b4e395928738061dd4f601be9ada
2020-11-05 18:29:30 +00:00
Ivan Lozano
86a1db7baf Merge "Add rust_grpcio module type." 2020-11-05 17:47:11 +00:00
Patrice Arruda
9be91078d8 Merge "Collect useful resource information of each executed process in soong_ui." am: bb42c44e71
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1466664

Change-Id: I00f056e654a72dcfe5777dd43c6f8e07f58853de
2020-11-05 17:30:04 +00:00
Patrice Arruda
bb42c44e71 Merge "Collect useful resource information of each executed process in soong_ui." 2020-11-05 17:17:43 +00:00
Thiébaud Weksteen
3e0d3f6ef5 Use Rust 1.47.0 prebuilts
Bug: 171280890
Test: cd external/rust; mm
Change-Id: I61097821a73a28a383a07b1fdcfe867872397b43
2020-11-05 17:35:34 +01:00
Thiébaud Weksteen
71512f3265 rust: set STD_ENV_ARCH
In 1.47.0, std::env requires the STD_ENV_ARCH environment variable to be
set to the target architecture [1].

[1] 8e8939b804/library/std/src/env.rs (L866)

Bug: 171280890
Test: cd external/rust; mm
Change-Id: If4ddf4b9bad2a1a7518a358a5fb597170a97c67e
2020-11-05 17:35:17 +01:00
Christopher Parsons
320fb35fe7 Merge "After bazel execution, symlink results in out/" am: fde53fff96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1488096

Change-Id: I0838c6441b30b37c81abf4b4d2a8319a90620df6
2020-11-05 15:30:32 +00:00