StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,593 Commits 1 Branch 0 Tags
dfa78b5e9045c8488eff9f64e6406820423db9c3
Commit Graph

5201 Commits

Author SHA1 Message Date
Treehugger Robot
456a16ff9f Merge "Improve mixed builds error messages" am: efc1bc7f2f am: c0eb594bcc am: 32a3dbc860 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2313738

Change-Id: I3ac14abde9f62be6252080070911a0d2c0ac3f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 23:24:50 +00:00
Treehugger Robot
32a3dbc860 Merge "Improve mixed builds error messages" am: efc1bc7f2f am: c0eb594bcc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2313738

Change-Id: I82f93ffefd012c5238e5beb20b5e7ecb50c3d4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 23:05:15 +00:00
Treehugger Robot
efc1bc7f2f Merge "Improve mixed builds error messages" 2022-11-28 22:06:21 +00:00
utzcoz
cc453080e3 Remove unused rules for platform-robolectric-4.4-prebuilt am: 4283bf300b am: 3d282865c4 am: 5c528597e9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2314978

Change-Id: Ic03b85b7215c2a07612e0bf77ff033c37cac6f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 17:56:42 +00:00
utzcoz
5c528597e9 Remove unused rules for platform-robolectric-4.4-prebuilt am: 4283bf300b am: 3d282865c4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2314978

Change-Id: I73c436aa94fa70e60d6bcd048bb594ebcbceb9b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 17:23:29 +00:00
utzcoz
4283bf300b Remove unused rules for platform-robolectric-4.4-prebuilt 
platform-robolectric-4.4-prebuilt was removed by
https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2298317,
and soong's special rules for platform-robolectric-4.4-prebuilt is not
needed anymore.

Test: m

Signed-off-by: utzcoz <utzcoz@gmail.com>
Change-Id: I3304aa1061d8b945b03cfe1a91f466ceb6ca1260
 2022-11-28 07:53:20 +00:00
Treehugger Robot
84c6ed43c7 Merge "Allow stubs implementation to be omitted" am: 378124baf1 am: 6ba2a5b746 am: 08c6c4c354 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301917

Change-Id: Iffbd72ff746585dc4631d4c2c1ed42202e9064da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 12:51:49 +00:00
Treehugger Robot
08c6c4c354 Merge "Allow stubs implementation to be omitted" am: 378124baf1 am: 6ba2a5b746 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301917

Change-Id: I586a02cd61b25390152dfa804ffe1d649f0e527c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 12:11:52 +00:00
Treehugger Robot
378124baf1 Merge "Allow stubs implementation to be omitted" 2022-11-24 11:12:18 +00:00
Usta (Tsering) Shrestha
bd2ebf3b80 Merge "volatile-status.txt to be translated to an order-only dep in build.ninja" am: 3caa38827c am: 91621346e3 am: fdfda6f69d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2313559

Change-Id: Iad307cfce2a38132711e2e2ac2128379d68c27d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 18:39:37 +00:00
Usta (Tsering) Shrestha
fdfda6f69d Merge "volatile-status.txt to be translated to an order-only dep in build.ninja" am: 3caa38827c am: 91621346e3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2313559

Change-Id: If455b6edd91ae38be5a4ce816be88bd9c293ed54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 16:27:54 +00:00
Usta (Tsering) Shrestha
3caa38827c Merge "volatile-status.txt to be translated to an order-only dep in build.ninja" 2022-11-23 15:31:16 +00:00
Cole Faust
1d8629d17d Prevent duplicated license_kinds am: 2ced8c8a57 am: 655af89517 am: f4591fe5c4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2313938

Change-Id: I1bc725aeec53d1f00a1cd329b327be616897803d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 09:33:39 +00:00
Cole Faust
f4591fe5c4 Prevent duplicated license_kinds am: 2ced8c8a57 am: 655af89517 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2313938

Change-Id: Ica42441b87d5d977797c6aadeb248ce6a619b4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 08:57:31 +00:00
Cole Faust
2ced8c8a57 Prevent duplicated license_kinds 
Bazel fails when there are duplicate license_kinds.

Bug: 260148018
Test: go test
Change-Id: I47a27d37d66be947e4a744cd04a3cdcc0b000de4
 2022-11-22 17:43:40 -08:00
Cole Faust
97d1527dd2 Improve mixed builds error messages 
When a target does not have a certain provider we need,
currently we just fail at the dictionary lookup. Change
it so that we fail with a message that tells us what
target had the issue.

Bug: 260131489
Test: Presubmits
Change-Id: I99fd018835c14eba0d4db54ba2769b2da1b278f6
 2022-11-22 14:38:24 -08:00
usta
fdb3e34df7 volatile-status.txt to be translated to an order-only dep in build.ninja 
Bug: b/260092986
Test: 1. `out/soong/build.ninja` has `bazel-out/volatile-status.txt` as order-only dep 2. `touch Android.bp && m --bazel-mode-staging aapt2` updates bazel-out/volatile-status.txt but aapt2 is not rebuilt

Change-Id: I1fa23437fea14e0d25b68d75010e964dff34766d
 2022-11-22 17:12:30 -05:00
Treehugger Robot
44087c9d56 Merge "use CommonAttributes for Tags in protos filegroups" am: dd33a493fb am: 1833a022c9 am: 81718c7af9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310794

Change-Id: Id93ec240e90b2e4a9fb2d98474443c6d37a96282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 16:54:52 +00:00
Treehugger Robot
81718c7af9 Merge "use CommonAttributes for Tags in protos filegroups" am: dd33a493fb am: 1833a022c9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310794

Change-Id: I0cba674c0a56fe8e76d5a9050d3d9d5e19dd02e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 16:21:01 +00:00
Alan Stokes
73feba3330 Allow stubs implementation to be omitted 
When defining a stubs library, allow specifying that the
implementation library does not need to be installed. This allows for
cases where the implementation is deployed in some non-standard way -
e.g. inside a Microdroid virtual machine.

Without this, we get build errors like: "TARGET module
com.android.compos requires non-existent TARGET module: libvm_payload".

Default behavior is unchanged. The change is protected by an allowlist
to limit usage to the immediate use case.

Bug: 243512108
Test: builds; soong tests pass
Test: Remove allowlist, see build failure
Change-Id: Iaae75f2e93b842f5944a7518cc95069d62c5a638
 2022-11-22 16:00:02 +00:00
Treehugger Robot
dd33a493fb Merge "use CommonAttributes for Tags in protos filegroups" 2022-11-22 15:46:59 +00:00
Spandan Das
bb7dd5f374 Add jarjar's deps to bp2build allowlist am: 6960ac12ac am: 1251969d6d am: d7891842ad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310383

Change-Id: I93a0b39dbb920fbe198d4e2e7f16fee2741b92a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 11:42:47 +00:00
Spandan Das
d7891842ad Add jarjar's deps to bp2build allowlist am: 6960ac12ac am: 1251969d6d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310383

Change-Id: I438970232a8e15802c509c973ab15b457011c3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-22 11:07:38 +00:00
Spandan Das
6960ac12ac Add jarjar's deps to bp2build allowlist 
jarjar switched its deps from prebuilts to source (aosp/2305413). Add
the source directory to the allowlist. This should fix broken bp2build
presubmits

Test: b build //external/jarjar
Change-Id: Ic7f37ea0ac167dc3b0f605ca0e67f8740652e0b1
 2022-11-22 04:58:06 +00:00
Sam Delmerico
e9b33f70ae use CommonAttributes for Tags in protos filegroups 
The Tags attribute is now available in CommonAttributes, and if we use
that one, we won't get errors with conflicting definitions of the
attribute if a global Tags value is added via CommonAttributes.

Test: m bp2build
Change-Id: I422ed817b84e6808ef60fe3599fe84332bc51d8e
 2022-11-21 16:25:20 -05:00
Paul Duffin
d6a68c3f59 Merge "Revert "Improve error reporting when depending on prebuilt implementation jar"" am: 6fcb32258a am: e32be9356e am: 7e6afb8759 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309604

Change-Id: I71751f523fa056c4bd9d07fcf58b8d41e29cbc06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-21 18:55:01 +00:00
Paul Duffin
7e6afb8759 Merge "Revert "Improve error reporting when depending on prebuilt implementation jar"" am: 6fcb32258a am: e32be9356e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309604

Change-Id: Ifc68fece37e9137a85d690b181912f3d3c4d2de4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-21 18:22:17 +00:00
Paul Duffin
6fcb32258a Merge "Revert "Improve error reporting when depending on prebuilt implementation jar"" 2022-11-21 17:20:03 +00:00
Paul Duffin
7ed6ff8c76 Revert "Improve error reporting when depending on prebuilt implementation jar" 
This reverts commit c61783b20d.

Bug: 257969510
Reason for revert: b/255275437 - breaks checkbuild target

Change-Id: I01f88053cc24dbc1a4eb5c009f15473bdff3d565
 2022-11-21 10:57:30 +00:00
Usta (Tsering) Shrestha
b5581e3337 Merge "ShouldKeepExistingBuldFileForDir look up by dir" am: 1ad62c7073 am: 5daaffb9db am: 9f639521e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301544

Change-Id: I34c4145293d3bc181c0ec8e813dc0f0d00305f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-19 05:16:37 +00:00
Usta (Tsering) Shrestha
9f639521e0 Merge "ShouldKeepExistingBuldFileForDir look up by dir" am: 1ad62c7073 am: 5daaffb9db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301544

Change-Id: I89fe23c1923093498d53147b9242a3c980a39474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-19 04:44:18 +00:00
Usta (Tsering) Shrestha
1ad62c7073 Merge "ShouldKeepExistingBuldFileForDir look up by dir" 2022-11-19 03:55:46 +00:00
Treehugger Robot
1f96975377 Merge "Provide Bazel timing breakdown for the mixed builds" am: 0351be5adc am: d96ff0d685 am: e7bb0b8dcf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2299299

Change-Id: I57c619f89b102e5b8d791f4c3d186055b8f0347d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-18 01:38:01 +00:00
Treehugger Robot
e7bb0b8dcf Merge "Provide Bazel timing breakdown for the mixed builds" am: 0351be5adc am: d96ff0d685 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2299299

Change-Id: Idd0420635184f66038193465480439184075940c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-18 01:07:46 +00:00
Sasha Smundak
4975c82666 Provide Bazel timing breakdown for the mixed builds 
Instead of single event in the build metrics
```
| soong_build.mixed_build.bazel          | 1:17.1 |
```
it will now show:
```
| soong_build.mixed_build.bazel          | 1:17.1 |
| soong_build.mixed_build.bazel.cquery   |   51.9 |
| soong_build.mixed_build.bazel.aquery   |   23.1 |
| soong_build.mixed_build.bazel.symlinks |    2.1 |
```

Test: treehugger
Change-Id: I84a7dda6e3122860da9aaa98bfa6afe33d392dcf
 2022-11-16 18:44:08 -08:00
Wei Li
4ad1c425e4 Merge "Fix the following issues in bazel_handler:" am: c33c2e732a am: 667f8e8e61 am: 24dc16fcef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2304953

Change-Id: Id55f569b425d1f6f26fa1975f7c335e780256528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 00:43:54 +00:00
Wei Li
24dc16fcef Merge "Fix the following issues in bazel_handler:" am: c33c2e732a am: 667f8e8e61 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2304953

Change-Id: I92801944a8f71ed24de5a180fc84b0d69e3fe2a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 00:15:12 +00:00
Wei Li
c33c2e732a Merge "Fix the following issues in bazel_handler:" 2022-11-16 23:45:47 +00:00
Sam Delmerico
68578f4281 Merge "export neverallow include dir list to Bazel" am: 775f2cb3cd am: c4366480fd am: 222d112fbc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302771

Change-Id: Icea4f72e843d8978dabd8dbfe90512e9b2c4d3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 22:11:51 +00:00
Sam Delmerico
222d112fbc Merge "export neverallow include dir list to Bazel" am: 775f2cb3cd am: c4366480fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302771

Change-Id: I11d6f39cf1021eca92802ed4135bc80c62d20617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 21:42:34 +00:00
Sam Delmerico
775f2cb3cd Merge "export neverallow include dir list to Bazel" 2022-11-16 20:52:17 +00:00
Wei Li
cbd181c8e8 Fix the following issues in bazel_handler: 
1) Convert coverage path wildcard to regex values for --instrumentation_filter to Bazel.
2) Handle the error properly when aquery commmand returns error.

Bug: 258397103
Test: CIs
Change-Id: Ie7485c2c45f2eb0e1ca0dc60478aae04ab151b61
 2022-11-16 08:59:23 -08:00
Alix Espino
d05ea71bf4 Merge "bp2build for java_library with .kt srcs or common_srcs" am: 3044987181 am: 65d96e5423 am: 99dbfe5b34 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302599

Change-Id: I25293fead4a82a4fd3cbc0e6e8e04815f0251148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 16:20:35 +00:00
Alix Espino
99dbfe5b34 Merge "bp2build for java_library with .kt srcs or common_srcs" am: 3044987181 am: 65d96e5423 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302599

Change-Id: I7eddaee6e8b8a4fc9e231ce71e1211acf5a5f980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 16:17:43 +00:00
Alix Espino
3044987181 Merge "bp2build for java_library with .kt srcs or common_srcs" 2022-11-16 15:40:55 +00:00
Usta Shrestha
ea9996411d ShouldKeepExistingBuldFileForDir look up by dir 
instead of scanning every entry in the map for prefix-match, search each ancestor of the dir

Bug: N/A
Test: bazel_test.go#TestShouldKeepExistingBuildFileForDir()
Change-Id: I7c9afa456cca5a70624ae1e9c9b96c43b0110c1e
 2022-11-15 21:39:37 -05:00
Sam Delmerico
46d08b4e39 export neverallow include dir list to Bazel 
Bazel needs to recreate the neverallow behavior for absolute includes,
so export the list of include dirs to soong_injection.

Bug: 250931909
Test: aosp/2302925
Change-Id: I3bd345ea4cfb3181f07e4570466f2fc8c5fe32da
 2022-11-15 17:33:21 -05:00
Alix
8062f4dee7 bp2build for java_library with .kt srcs or common_srcs 
java_library modules with .kt srcs or common_srcs will be converted into
module type kt_jvm_library

Test: m bp2build, manually inspected build files for allowlisted modules
Bug: 258688914
Change-Id: I8293a11c8247b4b76358d0991f82c6b61b58adc3
 2022-11-15 20:01:29 +00:00
Treehugger Robot
117f84f02a Merge "Only generated notices for built variants." am: c8a06ca8c8 am: d84901ed2c am: b775c15ec5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302372

Change-Id: I7a262873a93bd11bbf9d93b267eab809e2337d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 02:38:02 +00:00
Treehugger Robot
b775c15ec5 Merge "Only generated notices for built variants." am: c8a06ca8c8 am: d84901ed2c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302372

Change-Id: I1e1e78fae50c3505e05adf5fd427e3e7be679d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:49:53 +00:00