Commit graph

63885 commits

Author SHA1 Message Date
Liz Kammer
f92b583027 Merge "Allowlist missing dependency" am: 58f85e328b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480298

Change-Id: I16aa00f734919507576ffe9940d92b3ecbd1bbbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 14:25:30 +00:00
Liz Kammer
58f85e328b Merge "Allowlist missing dependency" 2023-03-10 13:58:43 +00:00
Wei Li
22174e2736 Merge "Revert "Add integration test for testing generated SBOM with .im..."" am: aacfacd967
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480154

Change-Id: I990c345e8557c4c1fc2f2dac18bd1d3cb1f4cef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 07:04:34 +00:00
Cole Faust
6167240026 Merge "Make using python 2 an error" am: 944053e52d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2212957

Change-Id: I5a475da6231b8e43aa188592d7977390ae916be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 07:04:02 +00:00
Cole Faust
f183fc5413 Merge "Export non-apex variants of modules to make" am: f42c21d5f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462194

Change-Id: I9e0170a7c44dd1cd966132948c23ecd16a7a45aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 07:03:35 +00:00
Wei Li
aacfacd967 Merge "Revert "Add integration test for testing generated SBOM with .im..."" 2023-03-10 06:40:54 +00:00
Cole Faust
944053e52d Merge "Make using python 2 an error" 2023-03-10 06:37:24 +00:00
Cole Faust
f42c21d5f8 Merge "Export non-apex variants of modules to make" 2023-03-10 06:36:03 +00:00
Android Culprit Assistant
68101fad40 Revert "Add integration test for testing generated SBOM with .im..."
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/5b65d203-d364-4ade-aabb-1330fe45236a).

Change-Id: I10231bc624a15a2ba477712b3a5950f5fc9113e8
2023-03-10 06:18:01 +00:00
Wei Li
48a9563f77 Merge "Add integration test for testing generated SBOM with .img files." am: d48644177a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453072

Change-Id: I5ab2d43deb9486d40ab541d2573d105a93f417db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 04:59:41 +00:00
Wei Li
d48644177a Merge "Add integration test for testing generated SBOM with .img files." 2023-03-10 04:47:47 +00:00
Spandan Das
80ec5d3fb6 Merge "Convert filegroups in api_bp2build" am: 3b965d4bb0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2481335

Change-Id: Ia28da77f7582b02b3203b05fc878edeeea134c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 03:03:37 +00:00
Jooyung Han
ebd9c5907c Merge changes I0de79b6e,Idc482f94 am: f1214133ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2479496

Change-Id: Ic2d398cccb0c7136fa0b8f9e4ce1ea58cc57deca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 03:03:15 +00:00
Spandan Das
3b965d4bb0 Merge "Convert filegroups in api_bp2build" 2023-03-10 02:45:12 +00:00
Jooyung Han
f1214133ce Merge changes I0de79b6e,Idc482f94
* changes:
  Add tests for conv_linker_config
  Fix conv_linker_config with multiple input json files
2023-03-10 02:26:59 +00:00
Spandan Das
bd52ea9ecf Convert filegroups in api_bp2build
api providing modules (droidstubs, cc_library etc.) can refer to the api
file via a separate filegroup module. Therefore these modules should be
generated in the api_bp2build workspace as well

Test: m api_bp2build && build/bazel/bin/bazel build
--config=api_bp2build --config=android //build/orchestrator/apis:*

Change-Id: I77371bd94a2794770b01b98aaf84b1bc42810841
2023-03-09 23:03:07 +00:00
Liz Kammer
ad1d8cb1d6 Allowlist missing dependency
Test: b build --config=android
//frameworks/av/media/audioaidlconversion/...
Fixes: 272576906
Change-Id: I8f60e6d84995db46be95a091bba45c1abdc97b47
2023-03-09 22:09:08 +00:00
Cole Faust
edc4c505f9 Make using python 2 an error
Except if BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES is set, and except for
some core py2 modules that can't be removed until python2 is fully gone.

Bug: 203436762
Test: m nothing
Change-Id: I62ccb6f5687eab1e79c372ffc234a90ca5b566ac
2023-03-09 11:56:04 -08:00
Cole Faust
ad222f271a Export non-apex variants of modules to make
Currently, non-apex variants of modules that are in apexes are not
exported to make unless they're apex_available to the platform. This
means that you can't `m` those modules directly.

However, there is a workaround in the apex androidmk implementation that
emits make rules for the removed modules, but just redirects them to
build the apex itself. We want to remove that, but one of the problems
with doing so is that you can no longer `m` many modules afterwards.

To fix that, unhide the apex's dependencies from make. To ensure they're
not installed, call SkipInstall() on them, and update SkipInstall() to
be more strict by setting `LOCAL_UNINSTALLABLE_MODULE := true`.

Bug: 254205429
Test: Presubmits
Change-Id: Ib094feb2c437ad50d8319c58caa997759e7ce32f
2023-03-09 11:20:10 -08:00
Zi Wang
fccda10b92 Merge "Sort expectTargets and actualTargets by name in bp2build test" am: 5c12bdfdd3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2476196

Change-Id: I77bdcb2fa61d806c87244be2ecccfd0f972fc7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 18:55:33 +00:00
Spandan Das
dc3f27f7b6 Merge changes Ib004c2c3,I6b63d9d0 am: d14a70d7ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2475621

Change-Id: I70c01922b3d6d7d0f4f7c8ceb547acc0f6dd9b68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 18:54:44 +00:00
Zi Wang
5c12bdfdd3 Merge "Sort expectTargets and actualTargets by name in bp2build test" 2023-03-09 18:17:51 +00:00
Spandan Das
d14a70d7ed Merge changes Ib004c2c3,I6b63d9d0
* changes:
  Create aliases for stubs in build/bazel/api_surfaces
  Add a method in bp2build to create aliases in another directory
2023-03-09 18:14:13 +00:00
Romain Jobredeaux
81771ec3d5 Merge "Call ResolveExcludes after arch-based sources computation in java.go" am: 8062140a16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2478276

Change-Id: Ide5af35c8e87f94fb26ba1f09e701f094272a3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 15:38:51 +00:00
Romain Jobredeaux
8062140a16 Merge "Call ResolveExcludes after arch-based sources computation in java.go" 2023-03-09 14:40:58 +00:00
Zijun Zhao
8991ae255f Merge "Revert "Revert "Enable -Wformat-insufficient-args globally""" am: add695f784
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2478737

Change-Id: I4740c1623afde3eb67e56d503d22b8dcc5c29f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 08:25:13 +00:00
Zijun Zhao
add695f784 Merge "Revert "Revert "Enable -Wformat-insufficient-args globally""" 2023-03-09 07:57:15 +00:00
Jooyung Han
fba49bbf56 Add tests for conv_linker_config
to cover the recent features.
- conv_linker_config proto with empty input
- conv_linker_config proto with existing output
- conv_linker_config proto with --append
- conv_linker_config proto with --force

Bug: n/a
Test: conv_linker_config_test
Change-Id: I0de79b6e05c2608e0e2f30dfbf04d8289672f362
2023-03-09 07:46:25 +00:00
Jooyung Han
f6fd4c2823 Fix conv_linker_config with multiple input json files
`conv_linker_config proto -s` should work with multiple json input
files, but ParseDict() overwrites list fields (e.g. provideLibs), not
appending elements.

Also added a test.

Bug: 264330513
Test: conv_linker_config_test
Change-Id: Idc482f941201f15e5fc276c0ffc0dfeaa09d0cc2
2023-03-09 07:46:00 +00:00
Cole Faust
21b35cc1f6 Merge "Use product variables from the overridden apex" am: ae3e4cc2fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2477957

Change-Id: I30240a9e42aa4a1ce671af59b2ea05b86c76bee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 00:46:44 +00:00
Cole Faust
ae3e4cc2fd Merge "Use product variables from the overridden apex" 2023-03-09 00:13:14 +00:00
Treehugger Robot
6ee94678b0 Merge "conv_linker_config handling existing output file" am: 36d1cd0189
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2475245

Change-Id: Ibe2b1e1128617a4766d393e6a6cf06e36d060ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 23:53:28 +00:00
Zijun Zhao
d156908820 Revert "Revert "Enable -Wformat-insufficient-args globally""
This reverts commit fa6b6843a7.

Reason for revert: Bug fix: https://googleplex-android-review.git.corp.google.com/c/platform/vendor/google/whitechapel/audio/+/21912759

Change-Id: I1c95f8d813171b500fa48c809bcffb0af7179f9a
2023-03-08 23:48:45 +00:00
Treehugger Robot
36d1cd0189 Merge "conv_linker_config handling existing output file" 2023-03-08 23:19:59 +00:00
Treehugger Robot
bac9372357 Merge "Remove slice_internals from features allow list" am: 4b68649eb0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2472148

Change-Id: Ibb111504b21c4e902e464acfdf88f60c8f855c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 22:11:28 +00:00
Wei Li
eecee5a695 Add integration test for testing generated SBOM with .img files.
Bug: 266726655
Test: CIs
Change-Id: Iacaaae50125c7f310828c79b7881ac1d83a1f9ed
2023-03-08 13:47:51 -08:00
Spandan Das
9e93d3d6e1 Create aliases for stubs in build/bazel/api_surfaces
- Create the alias under the module-libapi directory. This is the
  api_surface that cc_stubs_suite maps to.
- Create the alias only for "current" (atleast for now)
- Create one alias for the stub shared lib, and another for its headers

Test: b build @api_surfaces//... (with aosp/2475091)
Change-Id: Ib004c2c34256f971e74d75317fa5fbbe7273720e
2023-03-08 21:40:41 +00:00
Spandan Das
abedff0ca7 Add a method in bp2build to create aliases in another directory
The expected use case for this is to create aliases for stub libraries
in the @api_surfaces repository in build/bazel/api_surfaces.

This restricts the scope to just aliases. If we have a use case for
generating actual Bazel targets in another directory, a workaround could
be to generate the targets in the current directory (via
CreateBazelTargetModule) and aliases to it in the other directory

Test: go test ./bp2build
Change-Id: I6b63d9d018618d447fc7c260a2a94aaa00e57a4d
2023-03-08 21:40:26 +00:00
Treehugger Robot
4b68649eb0 Merge "Remove slice_internals from features allow list" 2023-03-08 21:38:01 +00:00
Romain Jobredeaux
3eaf747ae5 Call ResolveExcludes after arch-based sources computation in java.go
TEST: go test
Change-Id: I93a8ae5e0842dab03f73b0edb32841755d2ea435
2023-03-08 16:34:17 -05:00
Alix Espino
f8cf202b64 Merge "Created kotlinAttributes struct" am: eb33a1d474
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2475004

Change-Id: I4cbd9316cbf8340a9e2e95b6e4328402133e57dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 21:15:18 +00:00
Alix Espino
eb33a1d474 Merge "Created kotlinAttributes struct" 2023-03-08 20:50:30 +00:00
Cole Faust
912bc8862e Use product variables from the overridden apex
override_apex's bp2build converter had a bug where it was looking at
the product variables for the override_apex module itself instead of
for the base module it is overriding.

Fixes: 271424349
Test: go test
Change-Id: If1e2653d3751fa908faf0ab97dfa2e943ebe98ec
2023-03-08 12:29:50 -08:00
Zi Wang
fba0a210e0 Sort expectTargets and actualTargets by name in bp2build test
This is to match the behavior of BUILD file generation.

Test: m and all existing bp2build conversion tests

Bug: 271122205
Change-Id: I6320a65aaad06114817eaed722cc0a0939c57bc1
2023-03-08 10:35:58 -08:00
Ian Kasprzak
4aeed1dea1 Merge "Revert "Enable -Wformat-insufficient-args globally"" am: 8eb8ae649c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2477224

Change-Id: Ifa7bbd872be87a051d557896e603991025d6d3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 17:44:44 +00:00
Treehugger Robot
60303369de Merge "Don't create bp2build_all_srcs filegroups in queryview." am: e4b08c0123
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2476944

Change-Id: Ibb0b1278a44bf8d07c504fa16f6382700c464a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 17:42:58 +00:00
Ian Kasprzak
8eb8ae649c Merge "Revert "Enable -Wformat-insufficient-args globally"" 2023-03-08 17:41:52 +00:00
Alix
75db7840ab Created kotlinAttributes struct
makes it clearer which attributes are kotlin specific
embedded within javaCommonAttributes since both
java_* and android_* use kotlin.

Change-Id: Ib7c9b912a9901cd1c3d150ab1e0a79011d8e07de
Test: go test ./bp2build
2023-03-08 17:15:10 +00:00
Treehugger Robot
e4b08c0123 Merge "Don't create bp2build_all_srcs filegroups in queryview." 2023-03-08 17:07:59 +00:00
Ian Kasprzak
fa6b6843a7 Revert "Enable -Wformat-insufficient-args globally"
This reverts commit bb55424e55.

Reason for revert: b/272272172 - Breaking multiple builds on git_tm-qpr-dev-plus-aosp

Testing: https://android-build.googleplex.com/builds/abtd/run/L83100000959000587


Change-Id: I854e24735689b5a3b8373d3bc947d184338eedde
2023-03-08 16:49:33 +00:00