Commit Graph

61981 Commits

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

Change-Id: I7ae64787f874ee164bdaa8699496fc2e0c98f912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 22:37:39 +00:00
Treehugger Robot
efc1bc7f2f Merge "Improve mixed builds error messages" 2022-11-28 22:06:21 +00:00
Trevor Radcliffe
faae502cb9 Merge "bp2build conversion for Sanitize.Integer_overflow" am: 202f2afbf8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2277186

Change-Id: Id706d4c0a60b8c301219999ffe7b723a4f4c9b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 22:04:27 +00:00
Trevor Radcliffe
202f2afbf8 Merge "bp2build conversion for Sanitize.Integer_overflow" 2022-11-28 21:45:07 +00:00
Trevor Radcliffe
548fc5dcec bp2build conversion for Sanitize.Integer_overflow
and Sanitize.Misc_undefined.

Bug: 253428057
Test: Unit tests
Change-Id: Idd9b33e537d1b1c80b0c96a9590327dae13fada7
2022-11-28 19:31:34 +00:00
utzcoz
3d282865c4 Remove unused rules for platform-robolectric-4.4-prebuilt am: 4283bf300b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2314978

Change-Id: Ic5c1130f4a10a42716c017c37581d9393efcc2cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 16:57:44 +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
Yi-yo Chiang
d571130c9a Merge "cc: Add docstring for IsVndk() and UseVndk()" am: 9fd9129b57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310668

Change-Id: Iebde8af8a3695fed89db119556fbe562c91dc0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25 09:42:50 +00:00
Yi-yo Chiang
9fd9129b57 Merge "cc: Add docstring for IsVndk() and UseVndk()" 2022-11-25 09:17:26 +00:00
Yi-Yo Chiang
1080f0c495 cc: Add docstring for IsVndk() and UseVndk()
Note that IsVndk() returns true for all variants of vndk-enabled
libraries. Not only vendor variant, but also platform and product
variants of vndk-enabled library return true.

OTOH, `UseVndk() && IsVndk()` returns true for vendor and product
variants of vndk-enabled libraries, which actually include the actual
VNDK libs (which goes into the VNDK apex) and VNDK extension libs (which
goes to /product or /vendor partition).

Bug: 259361996
Test: Presubmit
Change-Id: Ib735fe0f7433284ca768d0e251a4f599fff5185c
2022-11-24 20:29:35 +08:00
Treehugger Robot
6ba2a5b746 Merge "Allow stubs implementation to be omitted" am: 378124baf1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301917

Change-Id: I6fb94bba4db679feb806ff8712d21eb7191b8b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 11:46:32 +00:00
Treehugger Robot
378124baf1 Merge "Allow stubs implementation to be omitted" 2022-11-24 11:12:18 +00:00
Treehugger Robot
1a94a8731a Merge "Use excludes from OS axis for OsAndInApex" am: e315b8b12a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2315038

Change-Id: If17886957c3b63f4884a0b08ad0de7d2904ee090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 17:59:57 +00:00
Treehugger Robot
e315b8b12a Merge "Use excludes from OS axis for OsAndInApex" 2022-11-23 17:17:19 +00:00
Anton Hansson
d023545ef4 Merge "extract_apks matches APKs with >= 1 matching ABI" am: c5cee23d16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2312534

Change-Id: I0ba9920874691b1f8e016066b62f1be7a2fa7256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 17:00:12 +00:00
Anton Hansson
c5cee23d16 Merge "extract_apks matches APKs with >= 1 matching ABI" 2022-11-23 16:29:31 +00:00
Usta (Tsering) Shrestha
91621346e3 Merge "volatile-status.txt to be translated to an order-only dep in build.ninja" am: 3caa38827c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2313559

Change-Id: I53e91cdc7cae562eb8289db689a4af8a57e0d8e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 16:00:03 +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
Liz Kammer
ffc17e4edb Use excludes from OS axis for OsAndInApex
The axis for OS and in APEX was previously ignoring the excludes from
OS, which would result in excludes for non-Android OSes being
incorrectly ignored.

Test: go test Soong tests
Test: b build //hardware/libhardware:all
Bug: 260131489
Change-Id: Ie77f763bea0f473ac69a0c6b6bc3216e7359ad12
2022-11-23 10:01:30 -05:00
Cole Faust
655af89517 Prevent duplicated license_kinds am: 2ced8c8a57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2313938

Change-Id: I067226e01d762b50b86905237a71edd3f676981b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 08:29:17 +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
Jihoon Kang
c45491f09b Merge "Fix java/fuzz_test.go post submit build breakage" am: ad8c092c08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2308928

Change-Id: Ib533bf64e19ff03d3b097461643cb80636b8e235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 00:05:02 +00:00
Jihoon Kang
ad8c092c08 Merge "Fix java/fuzz_test.go post submit build breakage" 2022-11-22 23:26:11 +00:00
Sam Delmerico
b48d57bdcd extract_apks matches APKs with >= 1 matching ABI
Prior to this change, the bundletool and extract_apks tools require that
all ABIs that an APEX or APK provides must be compatible with the
TargetConfig. Instead, this change allows an APK to be selected if it
has at least one compatible ABI with the TargetConfig.

Bug: 260115309
Test: go test .
Change-Id: If67ce8128099611257a834862295a2bf5fa427d3
2022-11-22 17:53:26 -05: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
Alexander Smundak
516d6f6f6a Merge "Allow profiling Soong from the full build" am: 2f213d0946
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309616

Change-Id: Ie1f0e96f44e19b21fed766f803a75c0564509c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 19:13:38 +00:00
Alexander Smundak
2f213d0946 Merge "Allow profiling Soong from the full build" 2022-11-22 18:52:25 +00:00
Jihoon Kang
a2d3947a4e Fix java/fuzz_test.go post submit build breakage
Context
- Fix build breakage in aosp-build-tools for darwin targets

Test: m
Bug: b/260020491
Change-Id: I892876cf1567b4464e86daca0b305510da0ab2fd
2022-11-22 17:51:23 +00:00
Spandan Das
384dedc2c7 Merge "Add min_sdk_version to aidlCmd for droidstubs" am: 53e680d2ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302600

Change-Id: Ie51714bd701f3b050f20da3f40665a98708558ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:20:10 +00:00
Colin Cross
d93b0b3f0b Merge "Remove SettingsOverlay* from legacyCorePlatformApiModules" am: 262d65d481
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2299658

Change-Id: Ic352e396fc5f9d7a11014c12365b609a8afdf3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:18:42 +00:00
Spandan Das
53e680d2ae Merge "Add min_sdk_version to aidlCmd for droidstubs" 2022-11-22 17:09:26 +00:00
Colin Cross
262d65d481 Merge "Remove SettingsOverlay* from legacyCorePlatformApiModules" 2022-11-22 16:39:04 +00:00
Paul Duffin
a00ee24e75 Merge "Remove support for unused env vars from sdk snapshot generation" am: 032734ca9f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302297

Change-Id: I30482022cb4fa9cc48ac70eebec1a1e233743cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 16:21:52 +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
Paul Duffin
032734ca9f Merge "Remove support for unused env vars from sdk snapshot generation" 2022-11-22 15:56:04 +00:00
Treehugger Robot
1833a022c9 Merge "use CommonAttributes for Tags in protos filegroups" am: dd33a493fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310794

Change-Id: I93cef34ebedd9d23f6b0d7b02d3530c2acce70ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 15:53:47 +00:00
Treehugger Robot
20ab2b8636 Merge "Pass "-Xgc:CMC" to dex2oat when userfaultfd GC is enabled." am: 657ee23d83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2304271

Change-Id: Ib3faede3e50c2196c7ad6aa3c7f8cf5b6791659b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 15:53:26 +00:00
Treehugger Robot
dd33a493fb Merge "use CommonAttributes for Tags in protos filegroups" 2022-11-22 15:46:59 +00:00
Treehugger Robot
657ee23d83 Merge "Pass "-Xgc:CMC" to dex2oat when userfaultfd GC is enabled." 2022-11-22 15:10:20 +00:00
Spandan Das
1251969d6d Add jarjar's deps to bp2build allowlist am: 6960ac12ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310383

Change-Id: Ifa254bc6a785479f98a92d4a2d409c6c71ccfbf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 10:40:51 +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
Nikita Ioffe
d497e25c63 Merge "Propagate stub_only_libs to the invocation generating stub sources" am: 663e060c64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309271

Change-Id: Ia739ae43736eb5ceffd53bf7dcf36c87b4c48567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 23:29:52 +00:00
Spandan Das
757b666c7f Add min_sdk_version to aidlCmd for droidstubs
JavaDoc's implementation of `aidlFlags` omits `min_sdk_version`, and
therefore aidl compiler would default it to a default version.

To fix this, pass the min_sdk_version explicitly

Bug: 253122520
Test: TH
Test: go test ./java
Change-Id: Ia8f639174f8361136596d0e7b3286606f84705cd
2022-11-21 22:59:38 +00:00
Nikita Ioffe
663e060c64 Merge "Propagate stub_only_libs to the invocation generating stub sources" 2022-11-21 22:55:46 +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
Jihoon Kang
8602f594e8 Merge "Add java/fuzz_test.go to test sources" am: f33d92603e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2307481

Change-Id: I42429b137b821782cb6b3e0ed14e444779a6ecc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 19:43:59 +00:00
Jihoon Kang
f33d92603e Merge "Add java/fuzz_test.go to test sources" 2022-11-21 19:29:58 +00:00
Sasha Smundak
faa97b7eb9 Allow profiling Soong from the full build
Test: treehugger
Change-Id: I5112364fff635b856a55744457f547d3eba91391
2022-11-21 10:56:51 -08:00
Jihoon Kang
b69a83a756 Merge "Update java_api_library prop name" am: ba36441424
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2307482

Change-Id: I1fcd6f8165d3f33143cc938979ab1cf45f54af6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 18:25:07 +00:00