Commit Graph

74438 Commits

Author SHA1 Message Date
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
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
Christopher Parsons
5b60cdaa36 Merge "Have ConvertWBp2build use Bp2buildMutatorContext" into main am: c331812a59 am: 95f97af223 am: 88db04e1a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756986

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

Change-Id: I846e1135d2137cc7cda45d45a77efbc51531e72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 19:28:25 +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
88db04e1a9 Merge "Have ConvertWBp2build use Bp2buildMutatorContext" into main am: c331812a59 am: 95f97af223
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756986

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

Change-Id: If7eec45e1cd834ff6d3d20971430c89fe8163b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 18:35:07 +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
Liz Kammer
19c685f867 Merge "Don't panic for unhandled product vars" into main am: 8e9ccda5d8 am: 2485bcc6aa am: 2e75462604 am: 714cf7e6e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755066

Change-Id: I41ec5198ac70df05e2aae57761a0665326871e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 18:22:00 +00:00
Christopher Parsons
c331812a59 Merge "Have ConvertWBp2build use Bp2buildMutatorContext" into main 2023-09-20 17:56:24 +00:00
Liz Kammer
714cf7e6e3 Merge "Don't panic for unhandled product vars" into main am: 8e9ccda5d8 am: 2485bcc6aa am: 2e75462604
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755066

Change-Id: I66cb4be10d842d3e599013fdb38ec46a94a89f2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:41:29 +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
Liz Kammer
9dd112bd8c Merge changes from topic "prebuilt-cc-shared-always" into main am: 9e12c78637 am: c4298a325d am: 336739ca4a am: 27d037d592
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755385

Change-Id: I00c1edb4e98e110ba6c4baadcee1a722f316b462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 16:49:21 +00:00
Liz Kammer
93191d5c14 Always convert prebuilt libraries am: e0cbc983ec am: e356c3a031 am: af70954086 am: ab5b7e79a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754807

Change-Id: I1eeddf1900a5d006115c4178a9cf0fd92a366a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 16:49:17 +00:00
Liz Kammer
c11ae2075e Always convert prebuilt cc library headers am: 86a407f284 am: 3c94d1a55d am: 817fb97644 am: c0d64cc6af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754806

Change-Id: I06121a8c96d1d46be17162585155ff94b35cf695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 16:49:14 +00:00
Treehugger Robot
a8176363c2 Merge "Make bp2build_all_srcs manual." into main am: 187af6648d am: ae45baa5d8 am: 51a07f545f am: 06f92ef5d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756187

Change-Id: I6ba336d86ffd25d85a4bbee7332e6255f0fccce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 16:49:00 +00: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
2e75462604 Merge "Don't panic for unhandled product vars" into main am: 8e9ccda5d8 am: 2485bcc6aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755066

Change-Id: I6e76540d5455f629de5aac855c6ad0816198da2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 16:48:29 +00:00
Liz Kammer
27d037d592 Merge changes from topic "prebuilt-cc-shared-always" into main am: 9e12c78637 am: c4298a325d am: 336739ca4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755385

Change-Id: Ice624e4373955bb69aad86b5c0f7c5de8c08b173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 15:54:29 +00:00
Liz Kammer
ab5b7e79a2 Always convert prebuilt libraries am: e0cbc983ec am: e356c3a031 am: af70954086
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754807

Change-Id: Ica530b3bc1ebec9bf722ad9be4434efae2c0ef05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 15:54:26 +00:00
Liz Kammer
c0d64cc6af Always convert prebuilt cc library headers am: 86a407f284 am: 3c94d1a55d am: 817fb97644
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754806

Change-Id: Iaa8f0852775cc0f68a9b99aae6d331c71613356c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 15:54:22 +00:00
Treehugger Robot
06f92ef5d4 Merge "Make bp2build_all_srcs manual." into main am: 187af6648d am: ae45baa5d8 am: 51a07f545f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756187

Change-Id: I3cebdd68c7aa9329b6993d7a5f98c4fa59b36103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 15:54:09 +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
Liz Kammer
336739ca4a Merge changes from topic "prebuilt-cc-shared-always" into main am: 9e12c78637 am: c4298a325d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755385

Change-Id: I7e9b54f36fa6fb32b3c070579859a66bdf3600d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 15:01:49 +00:00
Liz Kammer
af70954086 Always convert prebuilt libraries am: e0cbc983ec am: e356c3a031
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754807

Change-Id: If2b9012fffd6df33808a2a723bf075ae44cb61a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 15:01:46 +00:00
Liz Kammer
817fb97644 Always convert prebuilt cc library headers am: 86a407f284 am: 3c94d1a55d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754806

Change-Id: I44c1188ebbf006d65db4b9d622bebf300b126552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 15:01:44 +00:00
Treehugger Robot
51a07f545f Merge "Make bp2build_all_srcs manual." into main am: 187af6648d am: ae45baa5d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756187

Change-Id: I171759d3298d0d827db59df647cc86a53b61a74f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 15:01:29 +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
Aleksei Vetrov
2db6f494b3 Merge "NDK library: use prebuilts to check next level ABI" into main am: ed8fb7a6a6 am: faa2334d9c am: d1d3781cdc am: 2ef76eef9c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756785

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