StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,648 Commits 1 Branch 0 Tags
050f0fa35b39cdd1e89dbf6d2a4f238fd71a57f4
Commit Graph

71648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jingwen Chen
050f0fa35b Merge "Revert "bp2build converter for android_test_helper_app."" into main am: 38b7be9d29 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759106

Change-Id: I2c0c4621425d709ee3d98bdeaf5ebe00a0ee3aaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:00:14 +00:00
Jingwen Chen
915ddd751b Merge "bp2build converter for android_test_helper_app." into main am: 72e22018c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757525

Change-Id: I6ce6183e2ae3a2a0ebc5dfc8884fb27268831a7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 15:59:43 +00:00
Jingwen Chen
38b7be9d29 Merge "Revert "bp2build converter for android_test_helper_app."" into main 2023-09-21 15:14:29 +00:00
Jingwen Chen
2395286cda Revert "bp2build converter for android_test_helper_app." 
Revert submission 2757525-android_test_helper_app

Reason for revert: broke builds

Reverted changes: /q/submissionid:2757525-android_test_helper_app

Change-Id: I0e5f55078221d7f2151f1bbaa55bebdf5051c03c
 2023-09-21 15:12:19 +00:00
Jingwen Chen
72e22018c3 Merge "bp2build converter for android_test_helper_app." into main 2023-09-21 15:09:06 +00:00
Romain Jobredeaux
4bc34aa84e Merge "Bp2build support for JNI deps of android_app." into main am: 1c4048e08d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2622674

Change-Id: Ie3d0fefd42a14038e97cbecb5e93f677dca3cbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 15:04:52 +00:00
Romain Jobredeaux
1c4048e08d Merge "Bp2build support for JNI deps of android_app." into main 2023-09-21 14:36:02 +00:00
Trevor Radcliffe
12be5967fd Merge "Block CFI on static libraries" into main am: 9483e4873c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706817

Change-Id: I0c1d85bf958537d69c60ac03523a867027d3ae0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 13:18:20 +00:00
Liz Kammer
588e2a497e Merge "Add keep sorted tags" into main am: 53b33d07b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755387

Change-Id: I211078ec021eab35ef03fcade46b9cbfe09b0a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 13:18:10 +00:00
Liz Kammer
e29da0ff11 Merge "Handle prebuilt vs source selection in bp2build" into main am: af7c166f10 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755386

Change-Id: I6a38effb18b47b4eb4d858290bc4f8d245b4ccd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 13:17:48 +00:00
Trevor Radcliffe
9483e4873c Merge "Block CFI on static libraries" into main 2023-09-21 13:05:21 +00:00
Liz Kammer
53b33d07b1 Merge "Add keep sorted tags" into main 2023-09-21 12:16:10 +00:00
Liz Kammer
af7c166f10 Merge "Handle prebuilt vs source selection in bp2build" into main 2023-09-21 12:15:54 +00:00
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
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
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
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
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
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
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