Jiakai Zhang
c97c55b67a
Merge "Only dexpreopt system server jars for the primary arch." am: 7d78bad7e2
am: 0a21175f17
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2318994
Change-Id: I13236a3c8f7f23fee672cdfa8f58cc23d9e8f082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-29 12:49:20 +00:00
Jiakai Zhang
0a21175f17
Merge "Only dexpreopt system server jars for the primary arch." am: 7d78bad7e2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2318994
Change-Id: If2fab4a97addd3574e47c53d2679f8af28514b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-29 12:22:32 +00:00
Jiakai Zhang
7d78bad7e2
Merge "Only dexpreopt system server jars for the primary arch."
2022-11-29 11:57:24 +00:00
Jingwen Chen
1847739122
Merge "Revert "bp2build conversion for Sanitize.Integer_overflow"" am: ed6240d1bc
am: 4961d08c77
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2320909
Change-Id: I77113327987cf0c8bb7e8e83ee8bbcc245882ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-29 03:17:00 +00:00
Jingwen Chen
4961d08c77
Merge "Revert "bp2build conversion for Sanitize.Integer_overflow"" am: ed6240d1bc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2320909
Change-Id: I40c3af597f00f134846c2d4220d97f25ef8f1526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-29 02:49:07 +00:00
Jingwen Chen
ed6240d1bc
Merge "Revert "bp2build conversion for Sanitize.Integer_overflow""
2022-11-29 02:35:07 +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
Jingwen Chen
0ead79bd11
Revert "bp2build conversion for Sanitize.Integer_overflow"
...
Revert submission 2277186-ubsan_bp2build
Reason for revert: b/260630869 broke mixed_droid
Reverted Changes:
Idd9b33e53:bp2build conversion for Sanitize.Integer_overflow
I0d636e439:Add Sanitizer libs up the dependency tree
If113de7bc:Introduce toolchain features for sanitizers
Change-Id: Idf7e7b62f6fb6d4ff92341cc4c9c4b7426b70951
2022-11-28 22:44:35 +00:00
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
Trevor Radcliffe
0a17930799
Merge "bp2build conversion for Sanitize.Integer_overflow" am: 202f2afbf8
am: faae502cb9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2277186
Change-Id: I8a555fce868d1e7998dff87e9173ccd8002beb86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-28 22:32:29 +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
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
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
Jiakai Zhang
2fbc355f47
Only dexpreopt system server jars for the primary arch.
...
This change stops the build system from dexpreopting system server jars
for the secondary arch. System server jars are only loaded by the system
server, so the artifacts for the the secondary arch are not used.
Bug: 260577273
Test: Build a system image and no longer see artifacts for the
secondary arch.
Change-Id: I0b131a02e996ed50e7aec3bb0a221f8ceed9ce57
2022-11-28 15:38:23 +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
afac1c49cd
Merge "cc: Add docstring for IsVndk() and UseVndk()" am: 9fd9129b57
am: d571130c9a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2310668
Change-Id: Id32abe0292e7fa3352e1eaa37cec4b784276901b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-25 10:11: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
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
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
9c42c46efc
Merge "Use excludes from OS axis for OsAndInApex" am: e315b8b12a
am: 1a94a8731a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2315038
Change-Id: I8551497d7f03d224a08d1c765bf4ae694b342ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 18:28:21 +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
Anton Hansson
ba57f29e3e
Merge "extract_apks matches APKs with >= 1 matching ABI" am: c5cee23d16
am: d023545ef4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2312534
Change-Id: Ib56441713664845b4ba5937d4631be3963983d33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 17:28:32 +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
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
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
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
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
867230ecde
Merge "Fix java/fuzz_test.go post submit build breakage" am: ad8c092c08
am: c45491f09b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2308928
Change-Id: Ia11377a2c04cb157d857fb50bed261154bd53e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 00:32:10 +00: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
3ff7d3fe83
Merge "Allow profiling Soong from the full build" am: 2f213d0946
am: 516d6f6f6a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2309616
Change-Id: I67049f5805c5904d82ed0d106f73e40ef3b300bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 19:40:09 +00: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
dc7b8c6d8c
Merge "Add min_sdk_version to aidlCmd for droidstubs" am: 53e680d2ae
am: 384dedc2c7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302600
Change-Id: I64748ee937c61036586f394318de206e8f33963e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 17:46:13 +00:00
Colin Cross
f0dbe4013e
Merge "Remove SettingsOverlay* from legacyCorePlatformApiModules" am: 262d65d481
am: d93b0b3f0b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2299658
Change-Id: If318630d1e0a1ddf30fcd3d54fba40524824177c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 17:45:42 +00:00