Commit Graph

66239 Commits

Author SHA1 Message Date
Peter Collingbourne
4968b03a47 Merge "Pass -Wl,--as-needed when linking Rust binaries." am: 67237c82ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536016

Change-Id: I9f56304eb3f52b79997e9deefeccf8e752fe2460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 19:50:37 +00:00
Peter Collingbourne
67237c82ed Merge "Pass -Wl,--as-needed when linking Rust binaries." 2023-04-18 19:17:41 +00:00
David Fu
af4e33bcc8 Added assignee field to FuzzConfig.
Change-Id: Ia8cff7fa0980674ef6ed64922b6895b61c1e41a4
2023-04-18 10:43:24 -07:00
Usta (Tsering) Shrestha
2be450f6b1 Merge "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp" am: cf76125627 am: 708673e0bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2539110

Change-Id: Ia88ea7010fa72b207ba0e499183c68b8450d0e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 15:06:01 +00:00
Usta (Tsering) Shrestha
708673e0bc Merge "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp" am: cf76125627
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2539110

Change-Id: I647b7dabc471d0a31fe219bf19459d15fd91c100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 14:44:09 +00:00
Usta (Tsering) Shrestha
cf76125627 Merge "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp" 2023-04-18 14:18:51 +00:00
Jihoon Kang
115dae4d1c Merge "Add additional java_api_library module to java testing" am: d1a038c183 am: 8ce85df02b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2541410

Change-Id: I3744fac1c99f0b5df62e7ef29031c8a9e518a76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 04:25:30 +00:00
Jihoon Kang
8ce85df02b Merge "Add additional java_api_library module to java testing" am: d1a038c183
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2541410

Change-Id: Ie790bfc9e1aa042051b48efa9f08422332a033a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 04:06:09 +00:00
Jihoon Kang
d1a038c183 Merge "Add additional java_api_library module to java testing" 2023-04-18 03:46:55 +00:00
Inseob Kim
5860f8227c Add min_sdk_version prop to snapshots
Bug: 277403349
Test: build vndk/vendor snapshot and build
Change-Id: I226032bb0f9356cdef6747daec6ceb06589d9cbb
2023-04-18 11:30:22 +09:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
d2b9df318d Merge "bp2build: migrate export_{,system_}include_dirs -> *includes for cc_prebuilt_library{,_static,_shared}" am: fecec28c34 am: 2c82fa615c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2495176

Change-Id: I9c36bbd4a9715358024764a6d50eee3c685af246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:03:49 +00:00
Romain Jobredeaux
38d950e1b2 Merge "Allowlist CaptivePortalLogin and required dependencies." am: d7141be8ff am: 4ff491c45c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2537758

Change-Id: I2728f05498808aac862822c2be4cbd35c84f9017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:03:11 +00:00
Jihoon Kang
fb502593cd Add additional java_api_library module to java testing
Module lib surface is comprised of contributions from art, conscrypt,
and i18n api domains. On top of this, the module lib api surface generates an additional stub library containing the contributions of the non-updatable api domains. Adding this additional module to the testing module enables more thorough testing of module lib api scope java_api_library modules.

Test: m
Change-Id: Ia648651fb9e6cba2642de7e8d39047d888bf49ce
2023-04-17 21:28:47 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
2c82fa615c Merge "bp2build: migrate export_{,system_}include_dirs -> *includes for cc_prebuilt_library{,_static,_shared}" am: fecec28c34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2495176

Change-Id: I613dab4c44eeef4b504effb8853b52d1a6ff9fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 21:11:58 +00:00
Romain Jobredeaux
4ff491c45c Merge "Allowlist CaptivePortalLogin and required dependencies." am: d7141be8ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2537758

Change-Id: I95281c160d5b91ae86b6c32ce36e5602772f9d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 21:11:11 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
fecec28c34 Merge "bp2build: migrate export_{,system_}include_dirs -> *includes for cc_prebuilt_library{,_static,_shared}" 2023-04-17 21:01:21 +00:00
Romain Jobredeaux
d7141be8ff Merge "Allowlist CaptivePortalLogin and required dependencies." 2023-04-17 20:33:00 +00:00
Spandan Das
e8173a83cb Add TestApexes to ApexInfo
If any of apexes in apex_available is an apex_test, then that name will
be propagated down from that apex to each apex variant. This metadata
will be used to enforce that stub libraries cannot have more than one
apex_available.

This logic is necessary so that bp2build can select the correct
stub/impl.

(To avoid replicating this complexity in Bazel, we should consider
dropping the test apexes in Bazel BUILD files, next CL)

Bug: 277651159
Test: go build ./apex
Change-Id: I63617c1dc2a2d5c9cd7758c416fec7b4db1f10a7
2023-04-17 19:26:07 +00:00
Spandan Das
2dc6dfcb16 Drop the default apex_available value from BUILD files
If apex_available is missing from Android.bp files, ApexAvailable
returns [//apex_available:platform], which is the default. To avoid
BUILD file verbosity, remove the build system default value from the
generated BUILD files.

Bug: 277651159
Test: go test ./bp2build

Change-Id: I4129c2a93ac28578f46ebeed49baa23ce727aa1f
2023-04-17 19:26:03 +00:00
Spandan Das
8e6386e0aa Make //apex_available:platform the default.
go/Android.bp mentions that ["//apex_available:platform"] is the
default, but currently it was []. This change does not create any
additional module variants.

(Noticed this for libz, I was expecting its apex_available to be
platform and not an empty list)

Test: TH
Change-Id: I9af06f813b1a1d7b716939874f469bd2e1ce4d14
2023-04-17 17:28:06 +00:00
Ramy Medhat
15dad682a2 Merge "Enable reclient cache directory." am: 93c52efc15 am: 7e0ea34591
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517415

Change-Id: I33db4afa3e507833874cc1f1ab0bc839ea13ed06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 15:26:05 +00:00
Alix
c6a918aa11 add support for escaping for zip2zip
Change-Id: I6c2f39e24247752de065fd3116f670639322b943
Bug: 270896651
Test: zip2zip tests
2023-04-17 14:58:02 +00:00
Ramy Medhat
7e0ea34591 Merge "Enable reclient cache directory." am: 93c52efc15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517415

Change-Id: I68b1fc786560a94e846eb328c40f39d5d97f29f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 14:41:47 +00:00
Ramy Medhat
93c52efc15 Merge "Enable reclient cache directory." 2023-04-17 14:10:20 +00:00
Romain Jobredeaux
aa6e25df46 Allowlist CaptivePortalLogin and required dependencies.
Change-Id: I5ed5bfa70d5a7d179e8721df0e833315a2ada05a
Bug: 215230089
2023-04-17 09:50:04 -04:00
Jooyung Han
1dda598b41 apex: skip symbol files when replaced with prebuilt am: 9551384f65 am: 7feafd1599
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2539650

Change-Id: I0eaebfef83f4d529fc266a9bd7ecab311e97e159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:56:02 +00:00
Jooyung Han
7feafd1599 apex: skip symbol files when replaced with prebuilt am: 9551384f65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2539650

Change-Id: I83dce36b783176aeeafc0d60ee20fe786fb4fec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:26:36 +00:00
Jooyung Han
9551384f65 apex: skip symbol files when replaced with prebuilt
Apexer rule with symbol files causes "no build rule" error when the apex
is replaced with prebuilt.

Bug: 251299786
Test: m checkbuild (presubmit)
Change-Id: I7390f72c321beaeb49fcee4e02a219c07f184664
2023-04-17 15:25:17 +09:00
Peter Collingbourne
4629f7c886 Pass -Wl,--as-needed when linking Rust binaries.
aosp/2518976 revealed a pre-existing bug, which was that some Rust test
targets did not have all of their shared library dependencies packaged in
the host-unit-tests.zip file. Conveniently enough, these targets did not
actually depend on any of the symbols in the missing shared libraries, so
their DT_NEEDED entries were being removed by the --as-needed flag being
passed to the linker by rustc. This flag was dropped when we switched
to running the link command directly, causing the DT_NEEDED entries to
reappear and leading to runtime failures for these test binaries.

Although we could fix the issue that prevented these (unused) dependencies
from being packaged, there wouldn't be much point in doing so because
we already know that they aren't needed. So for now, let's return to
the status quo and keep passing --as-needed to the linker.

Bug: 278168700
Change-Id: Iae103803983240fa14cdbc2ff0d8ffb4329c6024
2023-04-14 17:36:57 -07:00
Florian Mayer
61d9f8ed5b Merge "Add handling for libc_hwasan to Soong" am: 7de9aa1a7b am: a330922efa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2526301

Change-Id: I75b3b678a26f98c8167b68a75ab8c7776c878db9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:55:55 +00:00
Treehugger Robot
8587cf5ee0 Merge "mixed builds correctly reference stubs libs" am: 0c3682be50 am: 4a94e7df5d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2530121

Change-Id: I5212ace1d06d9b6a0c77e4784fede848fef01945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:55:29 +00:00
Florian Mayer
a330922efa Merge "Add handling for libc_hwasan to Soong" am: 7de9aa1a7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2526301

Change-Id: I2ca2d815ebf432962ebcbccb62d8c6ba65407d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:38:37 +00:00
Treehugger Robot
4a94e7df5d Merge "mixed builds correctly reference stubs libs" am: 0c3682be50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2530121

Change-Id: I701f371b0afb4003298786f96365b59f0efe616e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:37:13 +00:00
Vinh Tran
2562585878 Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp
In a follow-up CL, we should eventually disallow aidl.include_dirs in cc rules so that the deps are always explicit and compatible with Bazel migration.

Test: go test
Bug: 278059962
Change-Id: Ia786cc8634d03589dc008f10b01e6bb2b9f2c7f0
2023-04-14 19:28:44 -04:00
Florian Mayer
7de9aa1a7b Merge "Add handling for libc_hwasan to Soong" 2023-04-14 23:27:57 +00:00
Treehugger Robot
0c3682be50 Merge "mixed builds correctly reference stubs libs" 2023-04-14 23:07:21 +00:00
Cole Faust
7bf85f7d57 Merge "bp2build support for python_test(_host)" am: ae31382119 am: 2958c917d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535119

Change-Id: If7a14c440c4a9f8a9d37eac678161b4db87be168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 21:55:51 +00:00
Colin Cross
dea1d03975 Fix addrsig warnings
ld -r reorders symbols and invalidates the .llvm_addrsig section, which
then causes warnings if the resulting object is used with ld --icf=safe.
The warning is especially common when building with musl, as the
clang_rt.crt* objects have .llvm_addrsig sections, are linked into
libc_musl_crt* using ld -r, and are then linked into every other binary
and shared library with --icf=safe.

Strip the .llvm_addrsig section after ld -r to prevent the warnings.

Test: m USE_HOST_MUSL=true host-native -k
Change-Id: Ia52a4756b9ebbb62115898d0de9f8641e6fea705
2023-04-14 14:31:14 -07:00
Cole Faust
2958c917d1 Merge "bp2build support for python_test(_host)" am: ae31382119
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535119

Change-Id: Ia7e551a6ffba649aa3a8712104f44093b038ce2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 21:24:19 +00:00
Cole Faust
ae31382119 Merge "bp2build support for python_test(_host)" 2023-04-14 20:49:01 +00:00
Cole Faust
4d76485722 Merge "Remove special handling of prebuilt_framework-res" am: 35dcf77fb6 am: 76093aad8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536611

Change-Id: I494711e2e3d19385289a08ece42ef02bba448d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 19:36:42 +00:00
Cole Faust
76093aad8d Merge "Remove special handling of prebuilt_framework-res" am: 35dcf77fb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536611

Change-Id: I52045eed5b301db542a0b502e5845d48b7363bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 19:06:52 +00:00
Cole Faust
35dcf77fb6 Merge "Remove special handling of prebuilt_framework-res" 2023-04-14 18:35:35 +00:00
Romain Jobredeaux
ef13c66c45 Merge "Delete platform mapping specific bp2build code" am: 141dcbb6cc am: 9bdecbed5b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517837

Change-Id: I72635ea4285b4b315131525af79d8032172915fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:18:29 +00:00
Mark Dacek
1554515dac Merge "Fix issue where bazel-force-enabled-modules aren't actually analyzed." am: 4e37219e4c am: a2c259c1a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494955

Change-Id: I3f494a5a113ac4e8aff92b7050ac2e8954293d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:18:08 +00:00
Sam Delmerico
3eda019e04 Revert "Respect Clang version override env vars."
Revert submission 2478283-master-I3cf18e7814ff52d526017e4fe34b17ab3d8f1080

Reason for revert: implementing a different way

Reverted changes: /q/submissionid:2478283-master-I3cf18e7814ff52d526017e4fe34b17ab3d8f1080

Change-Id: I1d690b6d322adc664e4c02d958f0183bbb78e669
2023-04-14 18:07:25 +00:00
Romain Jobredeaux
9bdecbed5b Merge "Delete platform mapping specific bp2build code" am: 141dcbb6cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517837

Change-Id: I1f86860443980ea169d52920f963e19c34fab1ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 17:49:41 +00:00
Mark Dacek
a2c259c1a7 Merge "Fix issue where bazel-force-enabled-modules aren't actually analyzed." am: 4e37219e4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494955

Change-Id: I1a65358259a2961d0479d58957a4f5b39ae7c971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 17:49:14 +00:00
Romain Jobredeaux
141dcbb6cc Merge "Delete platform mapping specific bp2build code" 2023-04-14 17:34:13 +00:00
Mark Dacek
4e37219e4c Merge "Fix issue where bazel-force-enabled-modules aren't actually analyzed." 2023-04-14 17:13:13 +00:00