StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,527 Commits 1 Branch 0 Tags
efe30e5bd1fd09d06b51eac7247f3239f21c8964
Commit Graph

5223 Commits

Author SHA1 Message Date
Yu Liu
56ccb1aecd Support abi check in bazel. 
Bug: 253498204
Test: Manual and unit test.
Change-Id: Id23c4f772f67c4ba05704eaad77322133474b42b
 2022-11-29 11:25:10 -08:00
Igor Foox
85e3a9f7d4 Merge "Add tzdata do the Bazel mixed build prod mode allowlist." am: 6463871fd9 am: 3e98a65694 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2298640

Change-Id: I68d33a57813850227d7433e746ad06ea1ebea5ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-29 19:14:19 +00:00
Igor Foox
6463871fd9 Merge "Add tzdata do the Bazel mixed build prod mode allowlist." 2022-11-29 18:09:23 +00:00
Kiyoung Kim
f160f7ffa8 Add more cases to vendor-installed module 
Current InstallInVendor only checks vendor property, but there are more
properties to check if the module will be installed in the vendor. This
change adds two more cases (soc_specific and proprietary) to the
function.

Bug: 233294155
Test: N/A
Change-Id: Ic3cb4c52f5097cdcc6231c0e85a62ce3ad6094b3
 2022-11-29 10:58:08 +09: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
Cole Faust
93dc19d39d Allowlist build files in external/python/absl-py 
Needed because we import absl-py in our bazel.workspace file.
It only worked before in b, not mixed builds, because b was
run from the real android tree instead of out/soong/workspace.

Bug: 234449134
Bug: 249685973
Test: Presubmits
Change-Id: I51c28e23260bed7ca7d4968fd823f52f0d26a0ab
 2022-11-28 12:00:00 -08: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
Igor Foox
ff387e55fc Add tzdata do the Bazel mixed build prod mode allowlist. 
Bugs:  b/258504104
Test: Ran a local build and checked build metrics and ninja file,
presubmits.

Change-Id: Ifdefdaebc13188e036b0b9cd55fbdcdfbdc8e11f
 2022-11-27 21:48:40 -05: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
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
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
Liz Kammer
92c725994f Extend sanitize_test.go 
Test: go test soong cc tests
Change-Id: I63fe74fb837e25f63074fb918a573f8b421562f1
 2022-11-22 11:46:34 -05: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
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
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
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
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
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
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
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
Ryo Hashimoto
f68c18f710 Add arch variants for Intel Atom CPUs 
Bug: 259201836
Test: Build aosp_x86_64-eng with modified build/make/target/board/generic_x86_64/BoardConfig.mk
Change-Id: Ic7410d6874c17af0e4492bf7704066ae9af1a531
 2022-11-16 17:26:53 +09: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
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
Bob Badour
3800b5a787 Only generated notices for built variants. 
Test: banchan dcla-notice mainline_modules_arm64; m apps_only dist
Change-Id: I6b0e2eb64f2f3db87dfed68affb44fe141da3eaa
 2022-11-14 14:17:55 -08:00
Paul Duffin
f70992ef8c Merge "Improve error reporting when depending on prebuilt implementation jar" am: 280765acc4 am: 3a185bd70e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2289734

Change-Id: I949092a5b3186c60d589e238e0c733f0e2b191b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 17:22:37 +00:00
Treehugger Robot
9c81789039 Merge "Export ndk/aml arches to Bazel" am: 4d87828d15 am: 165e0d4b46 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2300579

Change-Id: Ic9e3762d63c897fd868fc3a94df79d3c3745464a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 17:21:30 +00:00
Paul Duffin
280765acc4 Merge "Improve error reporting when depending on prebuilt implementation jar" 2022-11-14 16:38:11 +00:00
Treehugger Robot
4d87828d15 Merge "Export ndk/aml arches to Bazel" 2022-11-14 16:17:41 +00:00
Paul Duffin
74bd800c1b Merge "Allow namespace config to be tested properly" am: 73d394dec2 am: 38a5a9e80e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2292017

Change-Id: I6e071ee574a1b268fc262a68a278cb2f7398bd67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 15:04:48 +00:00