Commit Graph

76865 Commits

Author SHA1 Message Date
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
Treehugger Robot
b17e2b6d5a Merge "Enable restat for kapt stubs rules" into main am: f2d858e5ba am: 61958c4581 am: ba8d17586a am: 8264c2675d am: 5166939055
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755510

Change-Id: I605bd512a65bbe8048aab292c6c5e929ec80af9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 00:51:56 +00:00
Treehugger Robot
a7888b4197 Merge "Use same symbol for all receiver functions" into main am: 7ae5a5b8cb am: 1ceda3d5f8 am: 99ccb40d0a am: 3bee26a6b0 am: e16f819e26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756985

Change-Id: I02fa6527a39f49e050ef57b2f675388cce88a766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 00:51:18 +00:00
Sam Delmerico
9ee761fd07 fix failing rust_aconfig_library test am: 521eb20dc2 am: 30a5914983 am: 090e75b442 am: 06bf568df7 am: ff7db1395f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757201

Change-Id: Icdac00f65f93e79fd4d0f0afdade2f281a42ab24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 00:48:33 +00:00
Yu Liu
855cfc2fac Convert cc_aconfig_library to bazel.
Bug: 297358249
Test: Unit test and CI
Change-Id: Ic84128b0df16efe4255b52b83670ec9902c09383
2023-09-20 17:46:46 -07:00
Cole Faust
f3cf34e096 Decouple the target build variant from the platform
Bug: 301334589
Test: Presubmits
Change-Id: Id8ac0874a2d132d9965e339fd8dc705a7434bffb
2023-09-20 17:08:30 -07:00
Treehugger Robot
5166939055 Merge "Enable restat for kapt stubs rules" into main am: f2d858e5ba am: 61958c4581 am: ba8d17586a am: 8264c2675d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755510

Change-Id: I4b19e9eeaf7fbb39f2c99a5185b23a842c9a2549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 23:44:49 +00:00
Treehugger Robot
e16f819e26 Merge "Use same symbol for all receiver functions" into main am: 7ae5a5b8cb am: 1ceda3d5f8 am: 99ccb40d0a am: 3bee26a6b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756985

Change-Id: I3d193a0d5dda36665306c35d3413f01ebd131a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 23:44:37 +00:00
Sam Delmerico
ff7db1395f fix failing rust_aconfig_library test am: 521eb20dc2 am: 30a5914983 am: 090e75b442 am: 06bf568df7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757201

Change-Id: I3bbf59161be49d3d48cf96dbfad46dfc0199deef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 23:43:53 +00:00
Spandan Das
319711b0bc Create a bp2build converter for ndk_headers
And add this module type to alwaysConvertList

Test: go test ./bp2build
Bug: 300504837
Change-Id: Ic09738ab47e7c497287b73de0f952d52aa78dd17
2023-09-20 23:04:02 +00:00
Spandan Das
e993475ca6 Always convert ndk_library
This soong module will be converted to a cc_stub_suite macro in the
bp2build workspace

Test: TH
Bug: 298085502
Change-Id: I32a1a908d292e04b43d9be3efe7b16d1e4534466
2023-09-20 23:04:02 +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
8264c2675d Merge "Enable restat for kapt stubs rules" into main am: f2d858e5ba am: 61958c4581 am: ba8d17586a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755510

Change-Id: Ia3ef86825f22508bd7fc738bce3e27f4bc90ed94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 23:02:13 +00:00
Treehugger Robot
3bee26a6b0 Merge "Use same symbol for all receiver functions" into main am: 7ae5a5b8cb am: 1ceda3d5f8 am: 99ccb40d0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756985

Change-Id: I84ce23b9a76a0dd76423f18182b8929a50f50ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 23:01:56 +00:00
Sam Delmerico
06bf568df7 fix failing rust_aconfig_library test am: 521eb20dc2 am: 30a5914983 am: 090e75b442
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757201

Change-Id: Icc8e5bbe7d80107cbc6c16b7e4bf300278c606e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 23:01:28 +00:00
Sam Delmerico
5fabd059e6 Merge changes from topics "revert-2746976-revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT-KMAGKVIXAT", "sandbox-rust-inputs" into main am: 52d1cc334b am: 631a5ea5f9 am: db48881076 am: 05fdd8f82f am: 4d09da5870
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629131

Change-Id: I982cee72bd31039fff9a785782603662ce075685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:59:46 +00:00
Sam Delmerico
52e68bd7ac conditionally escape rule builder command am: d96a60685a am: 8e80e4a155 am: 58f55186fe am: 33dc412d2a am: 535914890e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751019

Change-Id: I7f2ca2fcf0acbcc0b5118c79c62adc53e21cd62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:59:44 +00:00
Sam Delmerico
d14a48ee83 Revert^2 "allow Ninja variables in RuleBuilder API" am: 0e2d63e4d2 am: 346f0c6242 am: 8d65403047 am: 8a68b1e858 am: 1ba0c6cc84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746468

Change-Id: I8e042d25d1ba5099a1826e58c643b8f547e67669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:59:41 +00:00
Sam Delmerico
fcc27b59c9 Revert^2 "add crate_root property to rust modules" am: 60375c4adf am: 73f5aae571 am: 1aeb848c0f am: 6c84d29fa1 am: ff6f08e914
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746467

Change-Id: Idd17ef13d8c8182a0a8b575f3cc99ecea04c7f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:59:36 +00:00
Sam Delmerico
46a2af813f Revert^2 "add rust_toolchain_rustc_prebuilt module type" am: 9333ac1249 am: c640053ddc am: 8de7c13090 am: d250522932 am: 8afa43019b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746466

Change-Id: I8b51c2d9e7af30ab1ff0605367efe780343c1450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:59:27 +00:00
Treehugger Robot
ba8d17586a Merge "Enable restat for kapt stubs rules" into main am: f2d858e5ba am: 61958c4581
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755510

Change-Id: I623bf8f9ecec17b6e85675246b01acd6be0a5951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:10:16 +00:00
Treehugger Robot
99ccb40d0a Merge "Use same symbol for all receiver functions" into main am: 7ae5a5b8cb am: 1ceda3d5f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756985

Change-Id: I9f0bf636c62b05a7d41c6b11930f6d77a207b38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:10:05 +00:00
Sam Delmerico
090e75b442 fix failing rust_aconfig_library test am: 521eb20dc2 am: 30a5914983
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757201

Change-Id: Ibd47cc170cb0337badd600f76c3f2ebb12ad4141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:09:45 +00:00
Sam Delmerico
4d09da5870 Merge changes from topics "revert-2746976-revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT-KMAGKVIXAT", "sandbox-rust-inputs" into main am: 52d1cc334b am: 631a5ea5f9 am: db48881076 am: 05fdd8f82f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629131

Change-Id: Ic620a4d6638c9484e0f36347c6650ba5cde95710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:56:42 +00:00
Sam Delmerico
535914890e conditionally escape rule builder command am: d96a60685a am: 8e80e4a155 am: 58f55186fe am: 33dc412d2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751019

Change-Id: If93cc8cc8d7886d76d4309e5b5937f32c26ca03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:56:39 +00:00
Sam Delmerico
1ba0c6cc84 Revert^2 "allow Ninja variables in RuleBuilder API" am: 0e2d63e4d2 am: 346f0c6242 am: 8d65403047 am: 8a68b1e858
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746468

Change-Id: I5bfc2587f58ffa0319481a5a98b8a749cbff107b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:56:36 +00:00
Sam Delmerico
ff6f08e914 Revert^2 "add crate_root property to rust modules" am: 60375c4adf am: 73f5aae571 am: 1aeb848c0f am: 6c84d29fa1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746467

Change-Id: I55c5775eeb9be2462321ed7b7569ccbdb753d67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:56:29 +00:00
Sam Delmerico
8afa43019b Revert^2 "add rust_toolchain_rustc_prebuilt module type" am: 9333ac1249 am: c640053ddc am: 8de7c13090 am: d250522932
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746466

Change-Id: I9aa82674220945ebcd2853574bca8c152207042d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:56:20 +00:00
Sam Delmerico
05fdd8f82f Merge changes from topics "revert-2746976-revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT-KMAGKVIXAT", "sandbox-rust-inputs" into main am: 52d1cc334b am: 631a5ea5f9 am: db48881076
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629131

Change-Id: I07947dbdb6472434ef43ab5c60d770f78cb9807b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:16:37 +00:00
Sam Delmerico
33dc412d2a conditionally escape rule builder command am: d96a60685a am: 8e80e4a155 am: 58f55186fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751019

Change-Id: I07911782859e2c1b81b7cda4a34febfbe4e957bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:16:33 +00:00
Sam Delmerico
8a68b1e858 Revert^2 "allow Ninja variables in RuleBuilder API" am: 0e2d63e4d2 am: 346f0c6242 am: 8d65403047
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746468

Change-Id: I627c17cad066b8b2e09cd47147491fc567f247fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:16:28 +00:00
Sam Delmerico
6c84d29fa1 Revert^2 "add crate_root property to rust modules" am: 60375c4adf am: 73f5aae571 am: 1aeb848c0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746467

Change-Id: I20687fcb2650dad92d17f7672f2431e51dbfcf19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:16:20 +00:00
Sam Delmerico
d250522932 Revert^2 "add rust_toolchain_rustc_prebuilt module type" am: 9333ac1249 am: c640053ddc am: 8de7c13090
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746466

Change-Id: Iae3daf6ed9ea39c62fce8074a982c7ebfcf7e85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:16:16 +00:00
Christopher Parsons
b8db405c7b Merge "Have ConvertWBp2build use Bp2buildMutatorContext" into main am: c331812a59 am: 95f97af223 am: 88db04e1a9 am: 5b60cdaa36 am: 097399434f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756986

Change-Id: I3bfd6e81efefe823c8f7b443d28d8df593aad93d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:15:09 +00:00
Dennis Shen
847e407829 Merge "build system implementation for c/cpp test mode codegen" into main am: 6c1121d31b am: 9f0ee99f8b am: 6616531cc1 am: 72c5a14b16 am: 5f5d2fedb9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752945

Change-Id: I1977011a5b2d292215bb80c0cbbbe025301430ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:14:57 +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
Sam Delmerico
db48881076 Merge changes from topics "revert-2746976-revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT-KMAGKVIXAT", "sandbox-rust-inputs" into main am: 52d1cc334b am: 631a5ea5f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629131

Change-Id: Iac45f81a0379f8c8786bb31716d08ae3f9406e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 20:24:18 +00:00
Sam Delmerico
58f55186fe conditionally escape rule builder command am: d96a60685a am: 8e80e4a155
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751019

Change-Id: If95d86a7f49aebf82ba3a97bafff3907734cea54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 20:24:13 +00:00
Sam Delmerico
8d65403047 Revert^2 "allow Ninja variables in RuleBuilder API" am: 0e2d63e4d2 am: 346f0c6242
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746468

Change-Id: I9cb3229f5844018ecba5d06ce9e10a968718ed6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 20:24:08 +00:00
Sam Delmerico
1aeb848c0f Revert^2 "add crate_root property to rust modules" am: 60375c4adf am: 73f5aae571
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746467

Change-Id: I4226c862f954b68960c3b84927ecdc7e60621699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 20:24:01 +00:00
Sam Delmerico
8de7c13090 Revert^2 "add rust_toolchain_rustc_prebuilt module type" am: 9333ac1249 am: c640053ddc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746466

Change-Id: I0e2ed9b104b9990e0536c2329b88a1a5eb93978d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 20:23:55 +00:00
Christopher Parsons
097399434f Merge "Have ConvertWBp2build use Bp2buildMutatorContext" into main am: c331812a59 am: 95f97af223 am: 88db04e1a9 am: 5b60cdaa36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756986

Change-Id: I6dd8a2e4865fc0555b713f3aef23fed0083e802d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 20:09:47 +00:00
Dennis Shen
5f5d2fedb9 Merge "build system implementation for c/cpp test mode codegen" into main am: 6c1121d31b am: 9f0ee99f8b am: 6616531cc1 am: 72c5a14b16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752945

Change-Id: I4b0945346a550c228efc120e761b97a3a1a11a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 20:09:37 +00:00