Treehugger Robot
a1b17990dd
Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main am: 8d3ea47ec1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755569
Change-Id: I1fc63295438b1e33ab5d7a21dfdc21f8469f7507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-21 04:20:01 +00:00
Treehugger Robot
8d3ea47ec1
Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main
2023-09-21 03:38:05 +00:00
Treehugger Robot
03de3b588f
Merge changes I8cf28041,If271c5f7 into main am: 59da77e19c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756946
Change-Id: I5b241be4e9f1c01f7e96f0397c80c3b52b6e29e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-21 03:26:30 +00:00
Treehugger Robot
59da77e19c
Merge changes I8cf28041,If271c5f7 into main
...
* changes:
Add version to stub label
Allowlist jni_libs and transitive deps of b/297405812
2023-09-21 02:29:57 +00:00
Spandan Das
9d47a82e27
Add version to stub label
...
This is a followup fix for aosp/2753352 that added the name of the
`cc_stub_suite` as deps of `unbundled_app` config setting. However,
cc_stub_suite is really a macro that expands to <name>-<ver>.
Add the version explicitly to rdeps
Bug: 298085502
Test: b build //build/bazel/examples/android_app/java/com/app:app_with_sdk_variant_of_jni_deps --config=android (with aosp/2755284)
Change-Id: I8cf2804141bb14589e11b03a138b715538a3f1ee
2023-09-20 23:04:02 +00:00
Spandan Das
1262f359a4
Allowlist jni_libs and transitive deps of b/297405812
...
This is an internal android_test (for now), but the deps are in aosp
Bug: 297405812
Test: TH
Change-Id: If271c5f7d159eafd9db739c2699e4470ce44c825
2023-09-20 23:04:02 +00:00
Treehugger Robot
61958c4581
Merge "Enable restat for kapt stubs rules" into main am: f2d858e5ba
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755510
Change-Id: Id1bda3613b5073ccd8786e81379676f08d637d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 21:12:53 +00:00
Treehugger Robot
1ceda3d5f8
Merge "Use same symbol for all receiver functions" into main am: 7ae5a5b8cb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756985
Change-Id: I75bf73d10820621dac581358255f9d0295510d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 21:12:40 +00:00
Sam Delmerico
30a5914983
fix failing rust_aconfig_library test am: 521eb20dc2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757201
Change-Id: I0131d835b1b60b240cb276906adcd2d74a3d07fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 21:12:04 +00:00
Treehugger Robot
f2d858e5ba
Merge "Enable restat for kapt stubs rules" into main
2023-09-20 20:40:28 +00:00
Treehugger Robot
7ae5a5b8cb
Merge "Use same symbol for all receiver functions" into main
2023-09-20 20:34:36 +00:00
Spandan Das
0e0a880fdd
Mark android apps with jni_uses_*_apis as unconvertible
...
These properties are used to determine if the app should include the sdk
variant of jni libs. Till we support this, mark androi_app/android_test
that set this property as uncovertible in allowlist v2
Bug: 299360988
Test: created a test app in an android.bp and verified that an
equivalent target is not created if either of these props are set
Change-Id: I925745d2667866a12b71788dc8f1bb1e1f3472cc
2023-09-20 19:53:30 +00:00
Sam Delmerico
521eb20dc2
fix failing rust_aconfig_library test
...
Bug: 301290764
Test: go test .
Change-Id: I4220738595067365be0c2236a05a365a2e90c734
2023-09-20 19:30:47 +00:00
Sam Delmerico
631a5ea5f9
Merge changes from topics "revert-2746976-revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT-KMAGKVIXAT", "sandbox-rust-inputs" into main am: 52d1cc334b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629131
Change-Id: I226da59220fedaa2ebb0344604aa97cae3d975de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 19:25:25 +00:00
Sam Delmerico
8e80e4a155
conditionally escape rule builder command am: d96a60685a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751019
Change-Id: I31eeb068f367331a29a693eaffc1d6bdd2d4d809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 19:25:22 +00:00
Sam Delmerico
346f0c6242
Revert^2 "allow Ninja variables in RuleBuilder API" am: 0e2d63e4d2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746468
Change-Id: I14a836d3c1dfa5a1cdd2b0f75a3c6c0eb26e351d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 19:25:18 +00:00
Sam Delmerico
73f5aae571
Revert^2 "add crate_root property to rust modules" am: 60375c4adf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746467
Change-Id: Ia9897fc6c3712e255a4968fc95e6f37d6f33f624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 19:25:11 +00:00
Sam Delmerico
c640053ddc
Revert^2 "add rust_toolchain_rustc_prebuilt module type" am: 9333ac1249
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746466
Change-Id: I324e0b0cb0926158b7f6de2efe93a0126495f501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 19:25:02 +00:00
Sam Delmerico
52d1cc334b
Merge changes from topics "revert-2746976-revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT-KMAGKVIXAT", "sandbox-rust-inputs" into main
...
* changes:
support sandboxed rust rules
conditionally escape rule builder command
Revert^2 "allow Ninja variables in RuleBuilder API"
Revert^2 "add crate_root property to rust modules"
Revert^2 "add rust_toolchain_rustc_prebuilt module type"
2023-09-20 18:48:21 +00:00
Christopher Parsons
95f97af223
Merge "Have ConvertWBp2build use Bp2buildMutatorContext" into main am: c331812a59
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756986
Change-Id: I541a63831ce789071cae8554e801fe323be3c6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 18:32:15 +00:00
usta
0391ca4eaa
Use same symbol for all receiver functions
...
cosmetic change
Bug: NA
Test: NA
Change-Id: I1781de1bd2108547f4da2a967d72a3a56e7362ed
2023-09-20 18:01:44 +00:00
Christopher Parsons
c331812a59
Merge "Have ConvertWBp2build use Bp2buildMutatorContext" into main
2023-09-20 17:56:24 +00:00
Dennis Shen
9f0ee99f8b
Merge "build system implementation for c/cpp test mode codegen" into main am: 6c1121d31b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752945
Change-Id: Ia3f87abe2be0e74809e82e55d6ffe2ad8e83aa2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 17:37:53 +00:00
Colin Cross
ed27322aa5
Enable restat for kapt stubs rules
...
The output of the kapt stubs rules only change when the public interface
of a kotlin class changes, which makes them a good candidate for restat.
This will prevent some unnecessary reruns of turbine annotation
processing.
Bug: 297356926
Test: builds
Change-Id: I39bd63284fd37058f69a0a3dace1ea5f4f50e8b5
2023-09-20 09:53:39 -07:00
Dennis Shen
6c1121d31b
Merge "build system implementation for c/cpp test mode codegen" into main
2023-09-20 16:48:56 +00:00
Liz Kammer
2485bcc6aa
Merge "Don't panic for unhandled product vars" into main am: 8e9ccda5d8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755066
Change-Id: I0bf38192856b2383bcaa7c121c21adc5976bb981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 15:50:51 +00:00
Liz Kammer
8e9ccda5d8
Merge "Don't panic for unhandled product vars" into main
2023-09-20 15:10:18 +00:00
Chris Parsons
637458d326
Have ConvertWBp2build use Bp2buildMutatorContext
...
This no-op refactoring facilitates some upcoming functional changes for
"bp2build allowlist v2". The work requires that the bp2build conversion
mutator be changed from a TopDown mutator to a BottomUp mutator.
Refactoring all bp2build-related methods so that they use Bp2buildMutatorContext
makes it easier to make this functional change without touching tens of
files and multiple projects.
Bug: 285631638
Test: m bp2build
Change-Id: I3d1ef3064146e959c6f0dc315350fc9764bf2bd2
2023-09-20 14:49:35 +00:00
Dennis Shen
c5e39f521b
build system implementation for c/cpp test mode codegen
...
Bug: b/300488560
Test: added unit test and tested with AconfigDemoActivity app
Change-Id: I6ad71cc2dada8feb53662ec47c8acad5bc43d5ce
2023-09-20 14:27:18 +00:00
Liz Kammer
c4298a325d
Merge changes from topic "prebuilt-cc-shared-always" into main am: 9e12c78637
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755385
Change-Id: Id551b291d40a64b5c48aea5e77bf0e47941408fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 14:03:51 +00:00
Liz Kammer
e356c3a031
Always convert prebuilt libraries am: e0cbc983ec
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754807
Change-Id: I172119cd82c5d08d3f3b9db83880e90e04a25191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 14:03:47 +00:00
Liz Kammer
3c94d1a55d
Always convert prebuilt cc library headers am: 86a407f284
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754806
Change-Id: I3f359524e03a303ea1130059177690223789d785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 14:03:43 +00:00
Treehugger Robot
ae45baa5d8
Merge "Make bp2build_all_srcs manual." into main am: 187af6648d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756187
Change-Id: I035085e6d65fdf4bc18bb4871e1af4bea2043cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 14:03:05 +00:00
Liz Kammer
9e12c78637
Merge changes from topic "prebuilt-cc-shared-always" into main
...
* changes:
Implement bp2build for java_sdk_library_import
Always convert prebuilt libraries
Always convert prebuilt cc library headers
2023-09-20 13:13:51 +00:00
Treehugger Robot
187af6648d
Merge "Make bp2build_all_srcs manual." into main
2023-09-20 12:58:00 +00:00
Aleksei Vetrov
faa2334d9c
Merge "NDK library: use prebuilts to check next level ABI" into main am: ed8fb7a6a6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756785
Change-Id: Ia771771d4651ccc9865575a64f7743b2a7bb9ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 12:16:55 +00:00
Aleksei Vetrov
ed8fb7a6a6
Merge "NDK library: use prebuilts to check next level ABI" into main
2023-09-20 11:16:59 +00:00
Jingwen Chen
5802d0795b
Make bp2build_all_srcs manual.
...
So that ... and :all target patterns don't pick it up.
Test: b build //bionic/libc/... and check that none of the filegroups
are built.
Change-Id: I79cd6fb6f7559409ae3e5b95b8b260970810cf7f
2023-09-20 10:25:09 +00:00
Cole Faust
d36d0e5082
Merge "Move the android_platform next to it's entrypoint product config file" into main am: c0f7bd1a15
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755346
Change-Id: I1042a44c0a4a1ea25a46b66d5fec903f646b4eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-19 21:16:34 +00:00
Cole Faust
c0f7bd1a15
Merge "Move the android_platform next to it's entrypoint product config file" into main
2023-09-19 20:42:52 +00:00
Christopher Parsons
3092afc3c2
Merge "Refactor bp2build tests for allowlist v2" into main am: 06ac78ce40
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755925
Change-Id: I67fedb5715b0d6cdb90f7f7af0187289a504f955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-19 20:24:22 +00:00
Liz Kammer
9e2a5a7d6d
Don't panic for unhandled product vars
...
Instead, we return an error. This allows us to access some product
variable information earlier when it will not be used as an attribute
without panicing
Test: m nothing
Change-Id: Id094b2b9e1364a8d174d99b3824fa149fb235b3e
2023-09-19 15:58:22 -04:00
Liz Kammer
e0cbc983ec
Always convert prebuilt libraries
...
Test: CI
Test: patch in CL using prebuilt mainline modules & build
Bug: 300640274
Change-Id: Ie00b111a04198b266985f3e1c34c960844c0a327
2023-09-19 15:58:22 -04:00
Liz Kammer
9a97a8f62a
Implement bp2build for java_sdk_library_import
...
Test: go test bp2build conversion tests
Test: enable modules build from prebuilt and m nothing
Bug: 300640274
Change-Id: I8c015aec546d052bef6c42869e12db4e87d39780
2023-09-19 15:58:22 -04:00
Liz Kammer
86a407f284
Always convert prebuilt cc library headers
...
Test: go tests
Test: CI
Test: patch in CL using prebuilts for mainline modules and build
Bug: 300640274
Change-Id: I73f70dac679e341670e1484ce57bc984f413d409
2023-09-19 15:58:20 -04:00
Christopher Parsons
06ac78ce40
Merge "Refactor bp2build tests for allowlist v2" into main
2023-09-19 19:42:40 +00:00
Aditya Kumar
37efec585e
Merge "Revert "Revert "riscv64: enable V.""" into main am: a1a29b75db
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752805
Change-Id: I8877fd822e4ce06810c1403d830d30ab486f80df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-19 17:41:42 +00:00
Chris Parsons
cd209035aa
Refactor bp2build tests for allowlist v2
...
Allowlist v2 will change bp2build by automatically disabling rdeps of
unconvertible modules. Many bp2build tests create bp2build stub modules
without an implementation,
This CL changes setup of such tests to also contain a BUILD file with
"stub implementations" of equivalent targets, to keep these test targets
convertible.
To verify this change in-place, this CL removes `bp2build_available:
false` from these dependencies.
This is a test-only change for bp2build tests.
Bug: 285631638
Test: m bp2build
Change-Id: I489480cbc4158a416b7abf57c35a6e2bc2ad6173
2023-09-19 17:04:11 +00:00
Cole Faust
b4cb0c857f
Move the android_platform next to it's entrypoint product config file
...
Because we're going to start generating partition images for the
product, and the partitions will eventually be checked in, we want
them to be in sensible locations. And the platform should be there as
well so all the targets for a product are co-located.
Bug: 297269187
Test: m nothing && b build --config=android //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal
Change-Id: Iaa25c44aa00295ada279d5fd49b5498bbafb89d5
2023-09-19 09:54:59 -07:00
Aditya Kumar
a1a29b75db
Merge "Revert "Revert "riscv64: enable V.""" into main
2023-09-19 16:52:31 +00:00