StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,289 Commits 1 Branch 0 Tags
b22fb3598107e8ec8851f901b03404f24e812d3a
Commit Graph

7613 Commits

Author SHA1 Message Date
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
Christopher Parsons
c331812a59 Merge "Have ConvertWBp2build use Bp2buildMutatorContext" into main 2023-09-20 17:56:24 +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
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
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
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
Cole Faust
9eede62c52 Merge "Move the android_platform next to it's entrypoint product config file" into main am: c0f7bd1a15 am: d36d0e5082 am: 0363b7c720 am: 89ff7490b3 am: 77ced78e01 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755346

Change-Id: I207ce7c33b39a8d384ef015349c0206c37f1b200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 00:48:15 +00:00
Cole Faust
d36d0e5082 Merge "Move the android_platform next to it's entrypoint product config file" into main am: c0f7bd1a15 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755346

Change-Id: I1042a44c0a4a1ea25a46b66d5fec903f646b4eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 21:16:34 +00:00
Cole Faust
c0f7bd1a15 Merge "Move the android_platform next to it's entrypoint product config file" into main 2023-09-19 20:42:52 +00:00
Liz Kammer
01de3ac619 Add keep sorted tags 
Test: n/a
Change-Id: Ibfb96b3e9c2f4707eb585714069bbb81671457b4
 2023-09-19 16:04:41 -04:00
Liz Kammer
e1b39a5286 Handle prebuilt vs source selection in bp2build 
Test: enable mainline modules build from prebuilts and build
Bug: 300640274
Change-Id: Ib1d6bbca7e0ab459515d3cf6378741e8368e7327
 2023-09-19 16:04:39 -04:00
Liz Kammer
9e2a5a7d6d Don't panic for unhandled product vars 
Instead, we return an error. This allows us to access some product
variable information earlier when it will not be used as an attribute
without panicing

Test: m nothing
Change-Id: Id094b2b9e1364a8d174d99b3824fa149fb235b3e
 2023-09-19 15:58:22 -04:00
Liz Kammer
e0cbc983ec Always convert prebuilt libraries 
Test: CI
Test: patch in CL using prebuilt mainline modules & build
Bug: 300640274
Change-Id: Ie00b111a04198b266985f3e1c34c960844c0a327
 2023-09-19 15:58:22 -04:00
Liz Kammer
9a97a8f62a Implement bp2build for java_sdk_library_import 
Test: go test bp2build conversion tests
Test: enable modules build from prebuilt and m nothing
Bug: 300640274
Change-Id: I8c015aec546d052bef6c42869e12db4e87d39780
 2023-09-19 15:58:22 -04:00
Liz Kammer
86a407f284 Always convert prebuilt cc library headers 
Test: go tests
Test: CI
Test: patch in CL using prebuilts for mainline modules and build
Bug: 300640274
Change-Id: I73f70dac679e341670e1484ce57bc984f413d409
 2023-09-19 15:58:20 -04:00
Cole Faust
b4cb0c857f Move the android_platform next to it's entrypoint product config file 
Because we're going to start generating partition images for the
product, and the partitions will eventually be checked in, we want
them to be in sensible locations. And the platform should be there as
well so all the targets for a product are co-located.

Bug: 297269187
Test: m nothing && b build --config=android //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal
Change-Id: Iaa25c44aa00295ada279d5fd49b5498bbafb89d5
 2023-09-19 09:54:59 -07:00
Jingwen Chen
3284042a0e Merge "[bp2build] android_test bp2build." into main am: 088c4b652b am: 3aaf1a80bd am: 3a02b22205 am: cd2454b172 am: 278d4778c8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

Change-Id: I7594547b6f80d7b63cde2458d556ccad3b7d508e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 02:46:52 +00:00
Treehugger Robot
8225cbfc71 Merge "Sort always convert by type list" into main am: 35f1ae0721 am: 48b6649189 am: 69be5dd734 am: 72ea2dc659 am: 5545f6aecc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: I24c7944653e30b8da3307fb096f74078f59453d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 00:07:04 +00:00
Jingwen Chen
3aaf1a80bd Merge "[bp2build] android_test bp2build." into main am: 088c4b652b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

Change-Id: Id15bc7e836370645f6777ecc4ad1f34cd678ba07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 00:04:46 +00:00
Jingwen Chen
088c4b652b Merge "[bp2build] android_test bp2build." into main 2023-09-18 23:27:14 +00:00
Treehugger Robot
48b6649189 Merge "Sort always convert by type list" into main am: 35f1ae0721 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: Ib624dd4be4dd06aae0f6ab4338113089d3b4fb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-18 18:55:13 +00:00
Treehugger Robot
35f1ae0721 Merge "Sort always convert by type list" into main 2023-09-18 18:03:58 +00:00
Liz Kammer
4fc71fff30 Sort always convert by type list 
Test: CI
Change-Id: Icdf1f4e8132d959b494e2570854ee06973a816b0
 2023-09-18 09:11:18 -04:00
Jingwen Chen
e12c083198 [bp2build] android_test bp2build. 
android_test is just an android_app, but the test bits are handled
purely in Starlark (tradefed_test_impl).

This enables building HelloWorldTests (android_test) with Bazel.

Bug: 297030120
Bug: 297029612
Test: WIP
Change-Id: I6d287c94b31698ea247da48e4cd6b5a75bc71e11
 2023-09-18 12:39:06 +00:00
Treehugger Robot
7701b8f7cd Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c am: 3a01b22df2 am: 62c3214586 am: d4f118cb2f am: 6d933e23d2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: Ic9e00c8cc74b655e625c1ea9de9280fbfb150b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-16 00:36:05 +00:00
Sam Delmerico
a588d153c8 support sandboxed rust rules 
This commit adds support for compiling rust rules inside the sbox
sandbox. To compile a rust module with sandboxing enabled, the entry
point to the crate must be specified via the `crate_root` property, and
all input sources and compile-time data must be specified via the `srcs`
and `compile_data` properties.

Bug: 286077158
Change-Id: I8c9dc5cf7578037a583b4be2e2f73cf20ffd4408
 2023-09-15 22:46:56 +00:00
Sam Delmerico
d96a60685a conditionally escape rule builder command 
For rules which use RuleBuilder with Ninja variables (using the
BuildWithUnescapedNinjaVars function) but are not sandboxed, the command
output by RuleBuilder must not be escaped, or else Ninja variables will
not be evaluated until they are run on the command line.

Test: m libnum_traits liboid_registry crosvm droid
Change-Id: I81611368ab1975220f7f517df2f57646deac2af8
 2023-09-15 22:41:58 +00:00
Sam Delmerico
0e2d63e4d2 Revert^2 "allow Ninja variables in RuleBuilder API" 
7b02d8159e

Change-Id: I9f2031162b019e51b869ea0db151c86db447b23d
 2023-09-15 22:41:56 +00:00
Sam Delmerico
9333ac1249 Revert^2 "add rust_toolchain_rustc_prebuilt module type" 
400749d1f0

Change-Id: I63f04e13605c43f800f01f45345e4b3dc61aefb7
 2023-09-15 22:40:16 +00:00
Treehugger Robot
3a01b22df2 Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: I6419fd0cb9cb50e9f2d993df8d77456458a3c5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 21:49:46 +00:00
Treehugger Robot
9f7028852c Merge "Allowlist ndk STL dependencies" into main 2023-09-15 21:23:49 +00:00
Yu Liu
24a382c72f Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: e6153b54bc am: 8c21c60e66 am: adf6ac190a am: bde239e2be am: 73e123b294 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741124

Change-Id: Iba630d0dbfae83726d5214458c2400e94d023388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 19:13:14 +00:00
Yu Liu
8c21c60e66 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: e6153b54bc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741124

Change-Id: I69520f0c66a3b42c7c161cedbf06ae711d9f93e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 17:22:06 +00:00
Yu Liu
e6153b54bc Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main 2023-09-15 16:46:01 +00:00
Christopher Parsons
99b2bfc1fe Merge "Add unit test for parsing build files in bp2build" into main am: 3671c385c7 am: 215849163c am: 13d1c0064b am: d5b7f6888d am: 3d946cfab7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751688

Change-Id: I8595ee5c92679859ed4fa7f5b803f46ca89326dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 04:52:42 +00:00
Christopher Parsons
215849163c Merge "Add unit test for parsing build files in bp2build" into main am: 3671c385c7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751688

Change-Id: I69cb0e41bfd6bca70683a1f35e3c1dce0feb517e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 01:14:23 +00:00
Usta (Tsering) Shrestha
0718f9863f Merge "Bp2build-convert droiddoc_exported_dir" into main am: 4e86d7a342 am: 8ae2b77eaa am: 7110fa52bb am: 48525538f7 am: 3e8ac2464a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734933

Change-Id: I54a898c0de6597a88632f23544ac189f234a2d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 00:26:05 +00:00
Christopher Parsons
3671c385c7 Merge "Add unit test for parsing build files in bp2build" into main 2023-09-15 00:04:09 +00:00
Usta (Tsering) Shrestha
8ae2b77eaa Merge "Bp2build-convert droiddoc_exported_dir" into main am: 4e86d7a342 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734933

Change-Id: I27cccf8626c2ae3a29816b5fa4a94b9c67f7182d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 20:44:17 +00:00
Chris Parsons
5011e61c71 Add unit test for parsing build files in bp2build 
This involves some minor changes to testing infrastructure.

This is a rollforward of aosp/2628496 with a couple of minor changes:

- In ParseBuildFiles, filter out all build files that are kept due
  to ShouldKeepExistingBuildFileForDir

- Add some minor test infrastructure for StubbedBuildDefinitions, with a
  couple of proof of concept tests used to demonstrate its usage. This
  pattern will become immensely more common as we implement allowlist v2
  (as we will need to update all tests which today simulate build
  definitions that have missing deps)

Bug: 285631638
Fixes: 286545783
Test: bp2build.sh
Test: m nothing
Change-Id: I7c3a03b02098e39dd8e51d327482b440f294478f
 2023-09-14 19:19:28 +00:00
Spandan Das
3d6ac190f2 Allowlist ndk STL dependencies 
Bug: 298088835
Test: TH
Change-Id: I43942ad17645c99de82a966d674ef80100eaffd0
 2023-09-14 17:34:30 +00:00
usta
72c6c6c8be Bp2build-convert droiddoc_exported_dir 
Bug: 283299388
Test: `m bp2build` and manual inspection
Change-Id: Ieec2094e446bb030f30103a7e1a06e35cbdcc72e
 2023-09-14 12:06:54 -04:00
Treehugger Robot
ea7e562d9e Merge "Allowlist more targets for framework" into main am: ece322f640 am: ccceb1b092 am: 8988cb7653 am: b9e06c423c am: e701b0ee03 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745834

Change-Id: Iff0aa6b1f38342e814dbc81834a6a798bfc7b79e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 01:35:05 +00:00