Romain Jobredeaux
947dfa760b
Bp2build support for JNI deps of android_app.
...
Change-Id: I3f934ecb0323129e1bb1eb75527395e39467380d
Bug: 297405812
2023-09-20 16:09:13 -04: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
Liz Kammer
9b22146363
Merge "Don't panic for unhandled product vars" into main am: 8e9ccda5d8
am: 2485bcc6aa
am: 2e75462604
am: 714cf7e6e3
am: 19c685f867
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755066
Change-Id: I5e6f9d0264f67aee0aae176a6f4d0b76604c9802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 19:31:34 +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
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
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
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
Liz Kammer
046539cacb
Merge changes from topic "prebuilt-cc-shared-always" into main am: 9e12c78637
am: c4298a325d
am: 336739ca4a
am: 27d037d592
am: 9dd112bd8c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755385
Change-Id: I7b9349b42ff46e5c2e88621da0ab1f82e7c77847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 17:40:58 +00:00
Liz Kammer
3a31be4887
Always convert prebuilt libraries am: e0cbc983ec
am: e356c3a031
am: af70954086
am: ab5b7e79a2
am: 93191d5c14
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754807
Change-Id: Id09a808c3892abb43f1891e9c4bd0d24aa8c4532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 17:40:54 +00:00
Liz Kammer
f8b4a4399e
Always convert prebuilt cc library headers am: 86a407f284
am: 3c94d1a55d
am: 817fb97644
am: c0d64cc6af
am: c11ae2075e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754806
Change-Id: Ibd3a1bad9eb2b2337abce9eede52902ed2b73909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 17:40:50 +00:00
Treehugger Robot
9ecbe59ebb
Merge "Make bp2build_all_srcs manual." into main am: 187af6648d
am: ae45baa5d8
am: 51a07f545f
am: 06f92ef5d4
am: a8176363c2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756187
Change-Id: I0b56ea29d1fc13db8d4a777125ffc9e57ee5f929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 17:39:52 +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
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
Trevor Radcliffe
f9abec0987
Block CFI on static libraries
...
Bug: 295805467
Test: Unit tests and inspecting generated BUILD files
Change-Id: I1bbd2f48ad384e0b5b6f7cc1458b12ded2748e8f
2023-09-20 16:01:20 +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
Aleksei Vetrov
c89d8ab69a
Merge "NDK library: use prebuilts to check next level ABI" into main am: ed8fb7a6a6
am: faa2334d9c
am: d1d3781cdc
am: 2ef76eef9c
am: 2db6f494b3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756785
Change-Id: I2a79b553b780120eb301be5cac82fa4038c5736d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 15:52:55 +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
Jingwen Chen
2848be4236
bp2build converter for android_test_helper_app.
...
This module converts simply to an android_binary, but with testonly = True.
Test: new unit tests
Test: new example app
Fixes: 283518652
Change-Id: If6b7661c32caa7dada6d492cce106d96236f6205
2023-09-20 14:31:17 +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
Aleksei Vetrov
2ef76eef9c
Merge "NDK library: use prebuilts to check next level ABI" into main am: ed8fb7a6a6
am: faa2334d9c
am: d1d3781cdc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756785
Change-Id: I97cc74618f4376c6d0a270b2fb5761d85b082505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-20 14:07:06 +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