Commit Graph

76865 Commits

Author SHA1 Message Date
Zi Wang
0e1590cff7 Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e am: cccefd7433 am: 7ccd48617c am: 8f1e3e697c am: 448d6bdcbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I3eb2da804ebfc6ef63777b55d2b2af02e1175711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 00:35:54 +00:00
Edward Liaw
02c3332d98 Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7 am: 05f4b4dd0f am: 5e95201ca8 am: c7ed522e1a am: b571a05c69
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: I88ee27714de65ec53610bc389c068da5b777b5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 00:35:43 +00:00
Treehugger Robot
c4b7cc7f33 [automerger skipped] Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f am: b5a1dfb557 am: b3130adf9e am: 66863f6f3b am: 53c84e4e92 -s ours
am skip reason: Merged-In I389d9535ea176991a1faa9beb46352b93363acd2 with SHA-1 71a5cd15c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: I10b35983455ef960cc5a0bae2027db77de38f6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 00:33:41 +00:00
Treehugger Robot
6d933e23d2 Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c am: 3a01b22df2 am: 62c3214586 am: d4f118cb2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: I0623653b49099d1511216e77cc4492b716c4bb57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 23:33:31 +00:00
Zi Wang
448d6bdcbe Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e am: cccefd7433 am: 7ccd48617c am: 8f1e3e697c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: Ibe1f64a299395e374c17ad33faf17863d39d31c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 23:32:58 +00:00
Edward Liaw
b571a05c69 Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7 am: 05f4b4dd0f am: 5e95201ca8 am: c7ed522e1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: I3cd850649ebcb2d8409d3daaf5deb77784dbee7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 23:32:13 +00:00
Treehugger Robot
53c84e4e92 Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f am: b5a1dfb557 am: b3130adf9e am: 66863f6f3b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: I5b953db566570e74bcffd78a4aee71c935009f17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 23:30:00 +00:00
Treehugger Robot
d4f118cb2f Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c am: 3a01b22df2 am: 62c3214586
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: Ie6eb329eaa3f7304088778548346bfa32d7e0d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:53:49 +00:00
Zi Wang
8f1e3e697c Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e am: cccefd7433 am: 7ccd48617c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I8b85af966cb9126b45ed39c97776ed65b0d71409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:53:07 +00:00
Edward Liaw
c7ed522e1a Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7 am: 05f4b4dd0f am: 5e95201ca8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: I4482ccc26b10e716a659128ae0f4b8cd02e952b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:52:57 +00:00
Jihoon Kang
fdf323697e Add java_api_contribution_import module type
java_api_contribution_import is a prebuilt module type of
java_api_contribution. It's build actions are identical to those of
java_api_contribution.

Test: m nothing
Bug: 300174357
Change-Id: I831806990b37b340af21858eb2bab5de62fdf7a9
2023-09-15 22:52:52 +00:00
Treehugger Robot
66863f6f3b Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f am: b5a1dfb557 am: b3130adf9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: Ia5c1d2ebbda7d73910dfd5aaf5c5673d943c02d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:50:27 +00:00
Sam Delmerico
a588d153c8 support sandboxed rust rules
This commit adds support for compiling rust rules inside the sbox
sandbox. To compile a rust module with sandboxing enabled, the entry
point to the crate must be specified via the `crate_root` property, and
all input sources and compile-time data must be specified via the `srcs`
and `compile_data` properties.

Bug: 286077158
Change-Id: I8c9dc5cf7578037a583b4be2e2f73cf20ffd4408
2023-09-15 22:46:56 +00:00
Sam Delmerico
d96a60685a conditionally escape rule builder command
For rules which use RuleBuilder with Ninja variables (using the
BuildWithUnescapedNinjaVars function) but are not sandboxed, the command
output by RuleBuilder must not be escaped, or else Ninja variables will
not be evaluated until they are run on the command line.

Test: m libnum_traits liboid_registry crosvm droid
Change-Id: I81611368ab1975220f7f517df2f57646deac2af8
2023-09-15 22:41:58 +00:00
Sam Delmerico
0e2d63e4d2 Revert^2 "allow Ninja variables in RuleBuilder API"
7b02d8159e

Change-Id: I9f2031162b019e51b869ea0db151c86db447b23d
2023-09-15 22:41:56 +00:00
Sam Delmerico
60375c4adf Revert^2 "add crate_root property to rust modules"
5162ff14fc

Change-Id: I9a76df938639676ee4aa7bdd2b2902e0e6df08d5
2023-09-15 22:41:51 +00:00
Sam Delmerico
9333ac1249 Revert^2 "add rust_toolchain_rustc_prebuilt module type"
400749d1f0

Change-Id: I63f04e13605c43f800f01f45345e4b3dc61aefb7
2023-09-15 22:40:16 +00:00
Treehugger Robot
62c3214586 Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c am: 3a01b22df2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: I7a00b33722f51121531b30b3981846f1b32e6c62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:58:04 +00:00
Zi Wang
7ccd48617c Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e am: cccefd7433
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I2bf4f8a67332da3d970ed7e24fc612658c4523ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:57:54 +00:00
Edward Liaw
5e95201ca8 Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7 am: 05f4b4dd0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: Ic53e1c7965ce3df6c2394847873ae7a6a146251e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:57:31 +00:00
Treehugger Robot
b3130adf9e Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f am: b5a1dfb557
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: I5f1466bc66a2108e15efcd36789311b20fbdc198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:55:48 +00:00
Treehugger Robot
030bf35e07 Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35 am: ec8bdaef40 am: 6653797f3c am: 12fb0d47d5 am: 8dcda002d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: I5fa739fffbdb2d36129d9ed10d6de339e7669dc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:53:41 +00:00
Kousik Kumar
69e4077ed7 Merge "Remove unused symlink code" into main am: 7a07b85fb5 am: c2bcfdb2ba am: ffd4c59db4 am: e252ef195e am: 736cf4ed7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: I00542a954a892f67ed1177051e93cf3459bf551b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:50:57 +00:00
Treehugger Robot
3a01b22df2 Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: I6419fd0cb9cb50e9f2d993df8d77456458a3c5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:49:46 +00:00
Treehugger Robot
9f7028852c Merge "Allowlist ndk STL dependencies" into main 2023-09-15 21:23:49 +00:00
Zi Wang
cccefd7433 Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I095b48f0bbe31fdc65df43a81693b7dfb7c60da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:59:17 +00:00
Edward Liaw
05f4b4dd0f Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: Ia2e034fae5fb4911c613580c87a9d2f4a1600140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:59:00 +00:00
Treehugger Robot
b5a1dfb557 Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: Ibd550eab55f703303f98fa6233e5e12387d8f26d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:56:21 +00:00
Treehugger Robot
8dcda002d0 Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35 am: ec8bdaef40 am: 6653797f3c am: 12fb0d47d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: Ib370e4320f350a69b8d4f7080e6033d2aafdd156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:49:16 +00:00
Kousik Kumar
736cf4ed7d Merge "Remove unused symlink code" into main am: 7a07b85fb5 am: c2bcfdb2ba am: ffd4c59db4 am: e252ef195e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: Idf665996d974be9510580ec85e87552854dedf7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:46:15 +00:00
Zi Wang
5d982b398e Merge changes from topic "drop_deps_no_srcs" into main
* changes:
  Always drop deps from java_library with no srcs
  Do not append deps to exports when java_library has only proto srcs
2023-09-15 20:39:35 +00:00
Edward Liaw
f3b7e79cc7 Merge "sh_binary: Implement OutputFileProducer for sh_test" into main 2023-09-15 20:33:46 +00:00
Treehugger Robot
12fb0d47d5 Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35 am: ec8bdaef40 am: 6653797f3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: I6f50034f3817c7d6d63283c7d08704f42970a84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:07:13 +00:00
Kousik Kumar
e252ef195e Merge "Remove unused symlink code" into main am: 7a07b85fb5 am: c2bcfdb2ba am: ffd4c59db4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: I4bab93cf43b27387cf3ed2038f57d8364caf2c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:05:45 +00:00
Treehugger Robot
5293f01b3f Merge "Implement bp2build converter for fdo_profile" into main 2023-09-15 19:54:22 +00:00
Treehugger Robot
6653797f3c Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35 am: ec8bdaef40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: Ia1d047e67f246d7b65bee6991d8c4e12251fe170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 19:13:30 +00:00
Yu Liu
24a382c72f Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: e6153b54bc am: 8c21c60e66 am: adf6ac190a am: bde239e2be am: 73e123b294
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741124

Change-Id: Iba630d0dbfae83726d5214458c2400e94d023388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 19:13:14 +00:00
Kousik Kumar
ffd4c59db4 Merge "Remove unused symlink code" into main am: 7a07b85fb5 am: c2bcfdb2ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: I438d19f4d0892961d484fd673582405e0e6c9174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 19:12:51 +00:00
Treehugger Robot
ec8bdaef40 Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: Ib0895ef14b71adab8e18caf2ba5be3780b5c3372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 19:09:59 +00:00
Yu Liu
73e123b294 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: e6153b54bc am: 8c21c60e66 am: adf6ac190a am: bde239e2be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741124

Change-Id: I302a175e26d3a4677417497f40771b72e2c4cafb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 19:00:32 +00:00
Treehugger Robot
2e3f8e6b35 Merge "Enable target features for riscv64 Rust builds" into main 2023-09-15 18:42:40 +00:00
Yu Liu
bde239e2be Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: e6153b54bc am: 8c21c60e66 am: adf6ac190a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741124

Change-Id: I2a8a07952fdc90a40305a853fe6148a77553f3ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 18:19:12 +00:00
Kousik Kumar
c2bcfdb2ba Merge "Remove unused symlink code" into main am: 7a07b85fb5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: I224878f9df52c7dc8feb1015bfed969fe3e77400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 18:17:15 +00:00
Treehugger Robot
efb00cfbb3 Merge "Implement bp2build converter for fdo_profile" into main 2023-09-15 18:12:30 +00:00
Kousik Kumar
7a07b85fb5 Merge "Remove unused symlink code" into main 2023-09-15 17:49:07 +00:00
Zi Wang
dd93636f1e Always drop deps from java_library with no srcs
This is the follow up from aosp/2750763

Test: CI and added unit test

Bug: 285952385
Change-Id: I64703ee4fa742b718ffb43f2af1b6ab43ddeb606
2023-09-15 10:37:16 -07:00
Yu Liu
adf6ac190a Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: e6153b54bc am: 8c21c60e66
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741124

Change-Id: I9f8f098809a0da6374e2fd9eae5cfce736bc4c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 17:27:13 +00:00
Yu Liu
8c21c60e66 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: e6153b54bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741124

Change-Id: I69520f0c66a3b42c7c161cedbf06ae711d9f93e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 17:22:06 +00:00
Yu Liu
e6153b54bc Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main 2023-09-15 16:46:01 +00:00
Elliott Hughes
726b001ae1 Revert "Revert "riscv64: enable V.""
This reverts commit 2583523144.

Change-Id: I5b05d546e17dee497dce1bfeb9290445e1c071c2
2023-09-15 16:36:59 +00:00