StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,668 Commits 1 Branch 0 Tags
09ac546858c9a889f138e92c4d75bd944a63f0c5
Commit Graph

71668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Jobredeaux
09ac546858 Merge "Use raw {min,target}_sdk_version properties in android_app converter" into main am: 2c11851598 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752828

Change-Id: I3727cd61852af5a5bf1450252f2e3752d3918de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 21:24:25 +00:00
Christopher Parsons
4bd587ec2f Merge "Refactor some tests to not use bp2build_avail" into main am: 92c59496e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759605

Change-Id: Idad223f4b0b0c3ceda0c1df7746ef7912f357910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 21:24:11 +00:00
Romain Jobredeaux
2c11851598 Merge "Use raw {min,target}_sdk_version properties in android_app converter" into main 2023-09-21 20:58:16 +00:00
Christopher Parsons
92c59496e0 Merge "Refactor some tests to not use bp2build_avail" into main 2023-09-21 20:57:33 +00:00
Trevor Radcliffe
2ba08f1fe9 Merge "Revert "Block CFI on static libraries"" into main am: 44e4102362 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758207

Change-Id: Id2de5234f04730be8a60be7387c5b011bcc0731a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:40:46 +00:00
Treehugger Robot
f7566167dd Merge "Revert^2 "bp2build converter for android_test_helper_app."" into main am: a56002a473 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759108

Change-Id: I9457cfd0e55045b6b5d5814999751891eed934fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:40:19 +00:00
Yu Liu
b84a5aaec3 Merge "Convert cc_aconfig_library to bazel." into main am: 62f7302701 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751020

Change-Id: I226eb08792eefe5750f4343dc0778176e89703d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:39:31 +00:00
Jihoon Kang
17728c0939 Merge "Move java_api_library modules to f/b/api/StubLibraries.bp" into aosp-main-future 2023-09-21 18:17:05 +00:00
Trevor Radcliffe
44e4102362 Merge "Revert "Block CFI on static libraries"" into main 2023-09-21 18:15:25 +00:00
Treehugger Robot
a56002a473 Merge "Revert^2 "bp2build converter for android_test_helper_app."" into main 2023-09-21 17:56:35 +00:00
Yu Liu
62f7302701 Merge "Convert cc_aconfig_library to bazel." into main 2023-09-21 17:43:07 +00:00
Chris Parsons
4c81ce0307 Refactor some tests to not use bp2build_avail 
Bug: 301312260
Test: presubmits
Change-Id: I67ca45f17d11e9b893fae5f6c6df1239ae4220b6
 2023-09-21 17:08:09 +00:00
Trevor Radcliffe
85d55c2847 Revert "Block CFI on static libraries" 
This reverts commit f9abec0987.

Reason for revert:
https://b.corp.google.com/issues/301444094
https://b.corp.google.com/issues/301443813
https://b.corp.google.com/issues/301437374

Change-Id: I6fd03e4d3c0930005178ad347f53156be8f15efc
 2023-09-21 17:04:43 +00:00
Spandan Das
5c4debfcd3 Merge "Always convert ndk_library" into main am: 02f2211931 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753345

Change-Id: Ia4b3796b68bf568d1d88410826882220cc25cae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:53:37 +00:00
Spandan Das
02f2211931 Merge "Always convert ndk_library" into main 2023-09-21 16:18:49 +00:00
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
6528999872 Revert^2 "bp2build converter for android_test_helper_app." 
2395286cda

Change-Id: I698c1e62b87f3d8338d8d207d06f62ec680d71c9
 2023-09-21 15:16:59 +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
Jihoon Kang
5623aa81e1 Move java_api_library modules to f/b/api/StubLibraries.bp 
This change was already submitted with
https://android-review.git.corp.google.com/q/topic:%22revert-2713677-revert-2655262-move_java_api_libraries-JTESUMBERD-FPSEKJYXCE%22
but was never propagated to downstream.

Ignore-AOSP-First: change already merged in aosp

Test: m nothing --build-from-text-stub
Merged-In: If66b5bba719bb389a69f2353d2218a89b2b96b90
Change-Id: Ia6867e8e4f8f57a2bbb0b763e7e11c7a6a76fdfd
 2023-09-21 04:53:39 +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
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
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
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