Commit Graph

66239 Commits

Author SHA1 Message Date
Trevor Radcliffe
aea506707f Merge "convert hidden visibility flag to feature" 2023-04-24 19:31:36 +00:00
Jeffrey Vander Stoep
b9897e60e2 Merge "Add option to use protobuf3" am: b611cf4240
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2555031

Change-Id: I9f4a6a45df82dba9ed42d0f31921e2e46b68e9cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 15:38:20 +00:00
Jeffrey Vander Stoep
b611cf4240 Merge "Add option to use protobuf3" 2023-04-24 14:56:58 +00:00
Sam Delmerico
ef69d47d03 disable mixed builds for sanitized cc modules
The Bazel rules don't currently support any sanitizers other than ubsan,
so we should disable mixed builds for modules which are sanitized.

Test: go test
Bug: 278772861
Bug: 253433725
Change-Id: Ia01fb8cb59154bdfb21a111b04af0350e1876b0b
2023-04-24 10:36:12 -04:00
Jeff Vander Stoep
c1490ec25e Add option to use protobuf3
Users of the rust_protobuf module can use the 'use_protobuf3'
option to select version 3 of the protobuf crate instead of the
current default of version 2. This unblocks teams that would like
to use protobuf 3 immediately and provides a mechanism for us to
incrementally migrate users of protobuf 2 to protobuf 3.

Test: Adds tests that are executed during every build.
Bug: 270895633
Change-Id: Ib6a18b77cfa7dc3cc604cea05269004b3712bbb6
2023-04-24 11:33:50 +02:00
Treehugger Robot
11b5bf51eb Merge "Add TestApexes to ApexInfo" am: a4c93e3bfc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2533721

Change-Id: Iebc940d0607d7283bba1ded0bfc9987a197829f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:54:41 +00:00
Treehugger Robot
a4c93e3bfc Merge "Add TestApexes to ApexInfo" 2023-04-24 07:03:34 +00:00
Treehugger Robot
5cc26c7484 Merge "Remove module with a cc_test_library static dep" am: e7773041d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2531519

Change-Id: Ibf86075a1001bc79fe4ae70a74b4aa5f9abd4ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 04:46:52 +00:00
Treehugger Robot
e7773041d6 Merge "Remove module with a cc_test_library static dep" 2023-04-24 04:08:52 +00:00
Spandan Das
ac693b2f81 Use stubs for system_dynamic_deps
system libraries (libc, libm, libdl) belong to the runtime apex api
domain. platform and other apexes should link against stubs and not impl
of these libraries. Update bp2build so that both apex/non_apex picks
stubs. These axes need to be more granular in the future, but for now
this works because
- non_apex axis (platform) is a separate api domain than the runtime apex
- com.android.runtime which matches apex axis has not been allowlisted
  yet.

Test: TH
Change-Id: I43f429a90875f30d176db17b144dd51674ec8adf
2023-04-24 01:51:33 +00:00
Mark Dacek
703dd55045 Merge "Squelch output for a failure case in mixed_mode_test" am: a23feefdc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2545012

Change-Id: I77352b8a2853a6557b02220fbdea71e91a37af70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 07:17:47 +00:00
Mark Dacek
a23feefdc4 Merge "Squelch output for a failure case in mixed_mode_test" 2023-04-22 06:42:08 +00:00
Inseob Kim
4daa04c173 Merge "Remove deps from Soong intermediate to symbols" am: d0d420d3b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2548131

Change-Id: Idb960c5312b7aaee24c5bb53132067702956ccac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 04:26:51 +00:00
Inseob Kim
d0d420d3b1 Merge "Remove deps from Soong intermediate to symbols" 2023-04-22 03:51:10 +00:00
Yabin Cui
eac64e9e8e Merge "Enable -funique-internal-linkage-names when afdo=true" am: a5b3752c2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2553670

Change-Id: I9da45572dd319bd3bff9ad36a0978c3534a43cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:04:19 +00:00
Yabin Cui
a5b3752c2e Merge "Enable -funique-internal-linkage-names when afdo=true" 2023-04-21 21:43:47 +00:00
Alix Espino
9906c02d19 Merge "add support for escaping for zip2zip" am: 75ebf1ba27
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2540630

Change-Id: Iee39017b9f61630df55eda179a69e2483a12823b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 21:42:05 +00:00
Yabin Cui
01c4456ce2 Enable -funique-internal-linkage-names when afdo=true
We used to enable unique names only when a profile is available.
But A profile generated for a binary without unique names doesn't
work well when building a binary with unique names. To avoid a
chicken-and-egg problem, this CL enables the flag when afdo=true,
whether a profile exists or not.

Bug: 241523910
Test: build
Change-Id: I74d834510d81d2db76e34d0488c74a60e1fcecd5
2023-04-21 14:41:55 -07:00
Alix Espino
75ebf1ba27 Merge "add support for escaping for zip2zip" 2023-04-21 21:03:52 +00:00
Liz Kammer
efc51d9396 Correct cc_test_library migration
Previously we were treating it as a shared library only, but
cc_test_library produces both a static and shared library.

Test: bp2build tests
Change-Id: I293d4246d581212b95765fa8f084301514d00dbf
2023-04-21 15:22:49 -04:00
MarkDacek
53506361da Squelch output for a failure case in mixed_mode_test
Currently, the expected output shows as the main text for
unrelated presubmit failures.
Bug: 278748024
Test: build/soong/tests/mixed_mode_test.sh

Change-Id: I553a82597c7c7791a822e330eb9b2663f35567a1
2023-04-21 17:55:42 +00:00
Treehugger Robot
0f11d8eecd Merge "Delete mixedBuildSupportedCcTest." am: fdef3506c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2550770

Change-Id: I0a1522034835983253cc717f0519ec26d635881c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 15:55:02 +00:00
Treehugger Robot
fdef3506c7 Merge "Delete mixedBuildSupportedCcTest." 2023-04-21 15:16:18 +00:00
Inseob Kim
5bedfee448 Remove deps from Soong intermediate to symbols
These should be handled by Makefile dependency (LOCAL_REQUIRED_MODULES).

Bug: 278832320
Test: build and see symbol files
Change-Id: I80ad9d8e7e8384e2ae3537cc681bc1d1b327d04c
2023-04-21 11:30:35 +09:00
Treehugger Robot
f06eb4f259 Merge "Flag off abidw tasks." am: 03e6e00e60
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2552910

Change-Id: I6c39687202ae180c4152e27956feaab01e9a96ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 22:25:36 +00:00
Treehugger Robot
03e6e00e60 Merge "Flag off abidw tasks." 2023-04-20 21:32:46 +00:00
Liz Kammer
74447fa446 Merge "Don't add apex_set deps in nondeterministic order" am: e5eb5786e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2550970

Change-Id: Id4226d8be3548e0ed0b69f7e6293247a6c347d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:57:19 +00:00
Trevor Radcliffe
a8b441613a convert hidden visibility flag to feature
in bp2build. The context here is that `-fvisibility=default` should
only be added for CFI if `-fvisibility=hidden` is not already
specified. This will be achieved using toolchain features. Note
that Soong itself never adds `-fvisibility=hidden`. This is only
ever added in the `cflags` property of a bp file.

Bug: 261733820
Test: Unit tests
Change-Id: Ib821e8c30a9cd03d2929b4bd2e771bec7b33fa66
2023-04-20 20:52:41 +00:00
Liz Kammer
e5eb5786e2 Merge "Don't add apex_set deps in nondeterministic order" 2023-04-20 19:51:21 +00:00
Dan Albert
326ab2444b Flag off abidw tasks.
Bug: http://b/277624006
Test: treehugger
Change-Id: I706a4da2d95ac51ad9fc600b3e4e52967b502c2c
2023-04-20 17:38:29 +00:00
Spandan Das
56797fd547 Merge changes I4129c2a9,I9af06f81 am: 0bf4ea53f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535121

Change-Id: I22ed8397dc756b4bf3da49b8b0ff4cd933bda310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 16:10:02 +00:00
Spandan Das
0bf4ea53f5 Merge changes I4129c2a9,I9af06f81
* changes:
  Drop the default apex_available value from BUILD files
  Make //apex_available:platform the default.
2023-04-20 15:30:20 +00:00
Liz Kammer
2dc7244af9 Don't add apex_set deps in nondeterministic order
Test: unit tests
Change-Id: I97a9708cb6e5a4f3aef55697b6127f61e4d17720
2023-04-20 11:30:19 -04:00
Jingwen Chen
a485d0935c Delete mixedBuildSupportedCcTest.
We can just rely on the prod/staging allowlists which name the modules directly.

Test: presubmits
Test: m nothing; showcommands adbd_test | grep bazel-out
Fixes: 279004435
Change-Id: I666855d6bbe63c628256c3eebd7ae581c0cbdedb
2023-04-20 14:35:12 +00:00
Inseob Kim
2f445ce30e Merge "Add min_sdk_version prop to snapshots" am: 0933fd59d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2542470

Change-Id: I4749c4894cd61e4b5267d74a7cb0caed6747d5b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 08:24:24 +00:00
Inseob Kim
0933fd59d7 Merge "Add min_sdk_version prop to snapshots" 2023-04-20 07:36:58 +00:00
Hang Lu
a98aab98c4 Enable HWASan for multiple modules in one place(Soong)
Environment variables HWASAN_INCLUDE_PATHS and
PRODUCT_HWASAN_INCLUDE_PATHS can be used to enable HWASan for multiple
modules, by just adding the module directory to the env variable.

Bug: b/271948407
Test: Set specific module directory to above env variable and check the
assembly codes of output elf files after building, finding hwasan
related symbols inside.

Change-Id: Ic49b515830c4469ca5fa94f547b26c0fb602fc54
2023-04-19 22:59:54 +00:00
Sam Delmerico
e2a2f11827 Merge "Revert "mixed builds correctly reference stubs libs"" am: dc0a4021cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2547450

Change-Id: Ia30ec857a22c25ef136fbb8d4b67580ef84fe098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 21:21:33 +00:00
David Fu
36d7e136b5 Merge "Added assignee field to FuzzConfig." am: 1ea1bc3b6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2544710

Change-Id: I800cadcb187f17cffc993893deb3d8ee4b0526fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 20:15:44 +00:00
Sam Delmerico
dc0a4021cd Merge "Revert "mixed builds correctly reference stubs libs"" 2023-04-19 19:57:49 +00:00
David Fu
1ea1bc3b6b Merge "Added assignee field to FuzzConfig." 2023-04-19 18:23:45 +00:00
Sam Delmerico
0ffa1f369d add LLVM_*_VERSION envvars to allowlist
Bug: 273563660
Change-Id: I7c1e6b244e137b27126abcba22684db66fae0327
2023-04-19 14:18:20 -04:00
Zi Wang
ccd6dc4983 Merge "Fix api fingerprinting with apex." am: 04af019ec0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2541451

Change-Id: Ia241cae72f87d96fb3ce7f7068795e04979b4c47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 17:56:57 +00:00
Zi Wang
04af019ec0 Merge "Fix api fingerprinting with apex." 2023-04-19 16:49:38 +00:00
Elliott Hughes
5823afeacd Merge "riscv64: stop reserving x18 for shadow call stack." am: 0ee012c2c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2534260

Change-Id: I10fe38fe8da297f6b91b2d179ef7d3335efda047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 15:16:12 +00:00
Elliott Hughes
0ee012c2c4 Merge "riscv64: stop reserving x18 for shadow call stack." 2023-04-19 14:38:37 +00:00
Usta (Tsering) Shrestha
1db4348734 Revert "mixed builds correctly reference stubs libs"
This reverts commit ca438e6b72.

Reason for revert: ci post-submit failures in aosp-master-bazel of targets mixed-droid-clean and mixed-droid-incremental:
FAILED: ninja: 'out/target/product/generic_arm64/obj/SHARED_LIBRARIES/libc_intermediates/libc.so.toc', needed by 'out/target/product/generic_arm64/obj/EXECUTABLES/updater_intermediates/LINKED/updater', missing and no known rule to make it
12:21:27 ninja failed with: exit status 1

Change-Id: I081b499d23f2568cdf6227c4e3b0278164086b69
2023-04-19 14:02:52 +00:00
Justin Yun
3b23ac0025 Add license visibility to prebuilt vsdk
libbpf_minimal can be included as a prebuilt vsdk library. This must
include the license_kinds of libbpf_minimal-license from soong.
Add the visibility for the prebuilts.

Bug: 271539873
Test: build against vsdk
Change-Id: Ib1c3e7705e7f234b2b54c2180642d6134c6131ea
2023-04-19 19:26:30 +09:00
Zi Wang
a4f7dae7b9 Fix api fingerprinting with apex.
Test: b build adbd and tzdata and verify target sdk version is correct

Bug: 277921995
Change-Id: I05a98fcb628f2a1d83358fe79f19c58010f05430
2023-04-18 21:12:02 +00:00
Peter Collingbourne
8c20cddae0 Merge "Pass -Wl,--as-needed when linking Rust binaries." am: 67237c82ed am: 4968b03a47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536016

Change-Id: I238fcab6b7294c56833e29cd38aa5e6f2dbb52b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 20:33:06 +00:00