Commit graph

47733 commits

Author SHA1 Message Date
Yi Kong
bd0d787fec Merge "Introduce afdo" am: 37d0a5790a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1917257

Change-Id: Id36e523c1dec9252fd7b42bd8dee1a3612aff6c6
2021-12-23 05:24:27 +00:00
Yi Kong
37d0a5790a Merge "Introduce afdo" 2021-12-23 04:53:29 +00:00
Treehugger Robot
0eb4f4ba22 Merge "Added src and exclude_src to debuggable builds" am: d0956e62be am: 5e69c78cdc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1930901

Change-Id: I2f7872539e1a008db31be88bbf5d6590ca90f660
2021-12-23 04:21:26 +00:00
Treehugger Robot
5e69c78cdc Merge "Added src and exclude_src to debuggable builds" am: d0956e62be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1930901

Change-Id: I9a210ebbefc8f868bc66714649dd934be5e7058c
2021-12-23 04:04:36 +00:00
Treehugger Robot
d0956e62be Merge "Added src and exclude_src to debuggable builds" 2021-12-23 03:32:47 +00:00
Ken Chen
78df0f1a4e Remove global bpf include path system/bpf/progs/include
Delete it because there is only one user left
(system/bpfprogs/time_in_state.c). It can be specified locally.

Bug: 202086915
Test: build and boot
Change-Id: I1cb0ceb7b8e3fb63af34e11e5fece11fa038b24e
2021-12-23 10:45:55 +08:00
Ken Chen
fd26444abd [NETD-BPF#21] Move a few headers to frameworks/libs/net
BPF headers used by both platform and mainline modules should be in
frameworks/libs/net.

Bug: 202086915
Test: build and boot
Test: cd packages/modules/Connectivity/netd; atest
Change-Id: I5a86ccd44a673a18138201f186b104f5214fd449
2021-12-23 10:00:58 +08:00
Evgenii Stepanov
aca699e608 Merge "Revert "Disable ubsan diagnostics under HWASan."" am: d30fcb15a9 am: 3eab590303
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1931386

Change-Id: Ib052c9751155a76d240c232301a5925261da62ec
2021-12-22 23:09:19 +00:00
Evgenii Stepanov
3eab590303 Merge "Revert "Disable ubsan diagnostics under HWASan."" am: d30fcb15a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1931386

Change-Id: Ie6615eb6deb46e5e1d5b134de3a5d78fca6c23c8
2021-12-22 22:51:23 +00:00
Evgenii Stepanov
d30fcb15a9 Merge "Revert "Disable ubsan diagnostics under HWASan."" 2021-12-22 22:29:43 +00:00
Cole Faust
0484c2378f Fix "unknown binary op: string + list" errors
Convert lists to strings when adding them to a string.

Bug: 201700692
Test: go test
Change-Id: Iefb68f48191136e7115a6d6bfa0608c73d5afdac
2021-12-22 14:08:08 -08:00
Treehugger Robot
3bb2deafe9 Merge "Improve error message when a required makefile can't be found" am: 51df3869ee am: bf314e524b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1931477

Change-Id: Ib7d950af673cd2571c791b338747f606b4492012
2021-12-22 21:43:49 +00:00
Liz Kammer
d8a72d7dc9 bp2build: convert host & prebuilt header libraries
Test: bp2build.sh
Change-Id: If8165eac7c17c4eef3686067257aa792121db59d
2021-12-22 16:34:27 -05:00
Treehugger Robot
bf314e524b Merge "Improve error message when a required makefile can't be found" am: 51df3869ee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1931477

Change-Id: Ice909e3f8c2edc2a03122afbe056a4af4a6aa33e
2021-12-22 21:32:20 +00:00
Jiakai Zhang
8f9664b188 Merge "Update dexpreopt_check to check all system server jars." am: 59571ddf67 am: 9758103119
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1930899

Change-Id: I5b586a3051a54fbb52a1703d6bccaa3cc07bf5fe
2021-12-22 21:20:05 +00:00
Treehugger Robot
51df3869ee Merge "Improve error message when a required makefile can't be found" 2021-12-22 21:16:44 +00:00
Jiakai Zhang
9758103119 Merge "Update dexpreopt_check to check all system server jars." am: 59571ddf67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1930899

Change-Id: Ied2c43f01d33212c8bb64e14eca7f0a5d85639d1
2021-12-22 21:02:17 +00:00
Liz Kammer
5430953c82 bp2build: Remove duplicate system shared libs
If a system shared lib is specified in shared_libs, this results in
duplicate values appearing, causing a failure in Bazel. This change
removes any system shared libraries that appear in shared libraries from
bionic OS axes where system_shared_libraries takes the default value.

Test: go soong tests
Test: temporarily allowlist directory with this issue, no longer hits
      duplicate library failure.
Change-Id: I9dce570b73c24973f695b815bce8d50f7259798d
2021-12-22 15:53:13 -05:00
Jiakai Zhang
59571ddf67 Merge "Update dexpreopt_check to check all system server jars." 2021-12-22 20:47:44 +00:00
Liz Kammer
5b8e7bcaf5 Improve error message for missing path + local dir
Test: androidmk in same directory as an Android.mk file being converted.
Change-Id: Id0e95e392884996e3e5a997c09f11501d3e967ed
2021-12-22 15:32:55 -05:00
Cole Faust
9b4fc0ac86 Merge "Prevent duplicate entries in ctx.include_tops" am: 7febef761a am: 948837f71d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1931259

Change-Id: I8bb7b2f27f53e7bdca572ad44cfcbf8fc2b57b70
2021-12-22 17:34:55 +00:00
Cole Faust
948837f71d Merge "Prevent duplicate entries in ctx.include_tops" am: 7febef761a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1931259

Change-Id: I5c73e05d1ea0cd8e327f16e9bd3f5e45e1b5b0f0
2021-12-22 17:18:21 +00:00
Cole Faust
7febef761a Merge "Prevent duplicate entries in ctx.include_tops" 2021-12-22 17:02:14 +00:00
Christopher Parsons
e40c2f5076 Merge "Handle the 'enabled' property in bp2build" am: 948e851b83 am: fdb30910fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1917398

Change-Id: Iabb80ffbb397056440f30fb744c83d347b9f21dc
2021-12-22 16:26:25 +00:00
Christopher Parsons
fdb30910fc Merge "Handle the 'enabled' property in bp2build" am: 948e851b83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1917398

Change-Id: Ica906b1be0280c6b3f1a3690d407c4141046022d
2021-12-22 16:07:42 +00:00
Christopher Parsons
948e851b83 Merge "Handle the 'enabled' property in bp2build" 2021-12-22 15:50:10 +00:00
Treehugger Robot
8078d15e35 Merge "sh_binary: Use pointers for optional attributes" am: d461407cae am: df49e17eb2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1931258

Change-Id: I74b2a34fd2e3c7bbdad0c19afee48e2810dec22b
2021-12-22 09:35:20 +00:00
Treehugger Robot
df49e17eb2 Merge "sh_binary: Use pointers for optional attributes" am: d461407cae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1931258

Change-Id: I3b7f2c6385167ae64361c79a55e5e51380dcb9cc
2021-12-22 09:19:02 +00:00
Jay Aliomer
2599d1d120 Added src and exclude_src to debuggable builds
Fixes: 200976245
Test: manually tested
Change-Id: I68b6230f30aa2c15e6a80010cd639ea453b4b29e
Merged-In: I68b6230f30aa2c15e6a80010cd639ea453b4b29e
(cherry picked from commit 85a8afa9e7)
(cherry picked from commit 778582f415)
2021-12-22 18:05:34 +09:00
Treehugger Robot
d461407cae Merge "sh_binary: Use pointers for optional attributes" 2021-12-22 09:01:55 +00:00
Evgenii Stepanov
4f41536076 Revert "Disable ubsan diagnostics under HWASan."
The original problem has been fixed in LLVM:
https://reviews.llvm.org/rG78f7e6d8d7956cb96d0fa0fd606192ca0218eee1

Bug: 191808836
Bug: 209991446
Test: m net_test_btm_iso with SANITIZE_TARGET=hwaddress

This reverts commit b15a564869.

Change-Id: Ie99a9a204e0a3f7c3ddf3efd74ac7f19db90215a
2021-12-21 16:31:31 -08:00
Cole Faust
7321b0985e Improve error message when a required makefile can't be found
Bug: 193566316
Test: go test
Change-Id: I41a28808c95df76f212980ef1e59047312fe587b
2021-12-21 16:11:16 -08:00
Treehugger Robot
376070fbc3 Merge "Add -std user flags to cc test to ensure order" am: fac51eb8fd am: 215682ac05
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1925818

Change-Id: If1ed95f8c550661e4fec97670cbff39da19f5d12
2021-12-21 22:39:00 +00:00
Cole Faust
f7ed5343de Prevent duplicate entries in ctx.include_tops
The include_tops hints are global for the whole parse
context (which is probably also something to fix), which
means that if an include_top hint is duplicated there will
be duplicated keys generated in the _entry starlark dictionary.

Bug: 193566316
Test: go test
Change-Id: I01a0546ac9be91ef46c5248e87e1a40e0f211193
2021-12-21 14:34:51 -08:00
Treehugger Robot
215682ac05 Merge "Add -std user flags to cc test to ensure order" am: fac51eb8fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1925818

Change-Id: I8a92e80751a3b021f53e984b9b18146aa647bb1e
2021-12-21 22:10:02 +00:00
Treehugger Robot
fac51eb8fd Merge "Add -std user flags to cc test to ensure order" 2021-12-21 21:57:42 +00:00
Chris Parsons
58852a05f3 Handle the 'enabled' property in bp2build
Also fix some bugs pertaining to configurable attribute handling of bool
attributes and label sttributes, so that they may support values across
multiple different axes at the same time.

Test: unit tests for bp2build
Test: mixed_droid

Change-Id: I411efcfddf02d55dbc0775962068a11348a8bb2c
2021-12-21 16:37:32 -05:00
Liz Kammer
48c6ead90d sh_binary: Use pointers for optional attributes
Empty strings for filename and sub_dir were unnecessicarily always being
propagated to BUILD files.

Test: build/bazel/ci/bp2build.sh
Change-Id: I39d6af12b1decd1d3813b92daa862ebc025daa7d
2021-12-21 16:01:53 -05:00
Treehugger Robot
a185769983 Merge "Add comments and clarify errors in neverallow" am: 68542bfcb5 am: fee1c91a2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874483

Change-Id: Ieb1a240267a91c88241ab544288048f855dbad49
2021-12-21 20:09:35 +00:00
Treehugger Robot
fee1c91a2e Merge "Add comments and clarify errors in neverallow" am: 68542bfcb5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874483

Change-Id: I2fc351a9b9d75704da37200e10226277f95dc553
2021-12-21 19:45:07 +00:00
Treehugger Robot
68542bfcb5 Merge "Add comments and clarify errors in neverallow" 2021-12-21 19:28:36 +00:00
Liz Kammer
7b901cb0fb bp2build remove "-std" from cflags am: cac7f690eb am: 547bdc5207
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927501

Change-Id: Iff51c739365eb8f70f2be6628a50dda504061302
2021-12-21 19:06:11 +00:00
Liz Kammer
547bdc5207 bp2build remove "-std" from cflags am: cac7f690eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927501

Change-Id: I772ce27bb6bcc2ada05363924477566ab3b96c6f
2021-12-21 18:53:16 +00:00
Liz Kammer
a3d7915c9e Add comments and clarify errors in neverallow
Sample of new error for violation:

error: system/bt/gd/rust/topshim/macros/Android.bp:10:1: module
"libtopshim_macros" variant "linux_glibc_x86_64": violates neverallow
requirements. Not allowed:
        module types: ["rust_benchmark" "rust_benchmark_host"
"rust_binary" "rust_binary_host" "rust_library" "rust_library_dylib"
"rust_library_rlib" "rust_ffi" "rust_ffi_shared" "rust_ffi_static"
"rust_fuzz" "rust_library_host" "rust_library_host_dylib"
"rust_library_host_rlib" "rust_ffi_host" "rust_ffi_host_shared"
"rust_ffi_host_static" "rust_proc_macro" "rust_test" "rust_test_host"]
      EXCEPT in dirs: ["device/google/cuttlefish/"
"external/adhd/" "external/crosvm/" "external/libchromeos-rs/"
"external/minijail/" "external/rust/" "external/selinux/libselinux/"
"external/uwb/" "external/vm_tools/p9/"
"frameworks/native/libs/binder/rust/" "frameworks/proto_logging/stats/"
"packages/modules/DnsResolver/" "packages/modules/Virtualization/"
"prebuilts/rust/" "system/core/libstats/pull_rust/"
"system/extras/profcollectd/" "system/extras/simpleperf/"
"system/hardware/interfaces/keystore2/" "system/librustutils/"
"system/logging/liblog/" "system/logging/rust/" "system/nfc/"
"system/security/" "system/tools/aidl/"
"tools/security/fuzzing/example_rust_fuzzer/"
"tools/security/fuzzing/orphans/" "vendor/"]

Old error:

error: system/bt/gd/rust/topshim/macros/Android.bp:10:1: module
"libtopshim_macros" variant "linux_glibc_x86_64": neverallow
-dir:device/google/cuttlefish/* -dir:external/adhd/*
-dir:external/crosvm/* -dir:external/libchromeos-rs/*
-dir:external/minijail/* -dir:external/rust/*
-dir:external/selinux/libselinux/* -dir:external/uwb/*
-dir:external/vm_tools/p9/* -dir:frameworks/native/libs/binder/rust/*
-dir:frameworks/proto_logging/stats/*
-dir:packages/modules/DnsResolver/*
-dir:packages/modules/Virtualization/* -dir:prebuilts/rust/*
-dir:system/core/libstats/pull_rust/* -dir:system/extras/profcollectd/*
-dir:system/extras/simpleperf/*
-dir:system/hardware/interfaces/keystore2/* -dir:system/librustutils/*
-dir:system/logging/liblog/* -dir:system/logging/rust/*
-dir:system/nfc/* -dir:system/security/* -dir:system/tools/aidl/*
-dir:tools/security/fuzzing/example_rust_fuzzer/*
-dir:tools/security/fuzzing/orphans/* -dir:vendor/*
type:"rust_benchmark" type:"rust_benchmark_host type:rust_binary
type:rust_binary_host type:rust_library type:rust_library_dylib
type:rust_library_rlib type:rust_ffi type:rust_ffi_shared
type:rust_ffi_static type:rust_fuzz type:rust_library_host
type:rust_library_host_dylib type:rust_library_host_rlib
type:rust_ffi_host type:rust_ffi_host_shared type:rust_ffi_host_static
type:rust_proc_macro type:rust_test type:rust_test_host

Test: go test soong tests
Change-Id: I1a7ee6bbc8258dfffa5a76f02c12fb1e54fdba1a
2021-12-21 12:00:43 -05:00
Liz Kammer
cac7f690eb bp2build remove "-std" from cflags
Soong overrides "-std" flags when provided via cppflags or conlyflags;
however, any user-provided "-std=" cflag will be overridden by Soong's
std flag handling.

For Bazel, we _always_ allow user to override via user provided flags.
To prevent conflicts, we remove the silently ignored values from
Android.bp files in the bp2build conversion.

Test: build/bazel/ci/bp2build.sh
Test: build/bazel/ci/mixed_droid.sh
Change-Id: I4c33b2ae593a7ff3ff8e3ad15ef3461354fc0c83
2021-12-21 11:49:01 -05:00
Liz Kammer
3f304d2d7e Merge "Fix typo in bp2build denylist." am: 5166a1c707 am: 1acfbe98bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927621

Change-Id: Ia75e1692c6462e9d9fb4b1b0fa09e5ecee7e3e9b
2021-12-21 16:20:21 +00:00
Liz Kammer
1acfbe98bb Merge "Fix typo in bp2build denylist." am: 5166a1c707
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927621

Change-Id: I1cea5857b57e2b72f73d6fc35ee7bcaf0c3986be
2021-12-21 16:02:32 +00:00
Liz Kammer
5166a1c707 Merge "Fix typo in bp2build denylist." 2021-12-21 15:44:27 +00:00
Jiakai Zhang
d806dd4f1d Update dexpreopt_check to check all system server jars.
After this change, standalone system server jars will also be checked.

Bug: 203198541
Test: m nothing
Change-Id: I80f5efe9c7f0386af175d7a37398ffa000d6ba59
2021-12-21 12:51:36 +00:00
Treehugger Robot
beb984e0cd Merge "Pass --write-reference-baseline to lint" am: 430059b422 am: dd0667e31d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822276

Change-Id: I455c581e12063f406e257ff9e7307a5509648b2e
2021-12-21 09:13:09 +00:00