diff options
| author | Colin Cross <ccross@android.com> | 2022-03-30 00:09:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-30 00:09:27 +0000 |
| commit | 5cb11a82cc31770393b83c0c8e3e1d3762e21409 (patch) | |
| tree | 2ae63dfae2eea8c5a2caec365b4464ff194d1c4b | |
| parent | d14f308fe65d808bf4eb4400b9ea3c0357b3b9aa (diff) | |
| parent | a2b046a57848693a032c50d790606ac9ce86cd87 (diff) | |
| download | extras-5cb11a82cc31770393b83c0c8e3e1d3762e21409.tar.gz | |
Merge "Tweak linux_glibc properties for musl builds in system/extras"
| -rw-r--r-- | libfec/Android.bp | 2 | ||||
| -rw-r--r-- | simpleperf/Android.bp | 23 | ||||
| -rw-r--r-- | verity/fec/Android.bp | 5 |
3 files changed, 29 insertions, 1 deletions
diff --git a/libfec/Android.bp b/libfec/Android.bp index c19f6a90..302d8e40 100644 --- a/libfec/Android.bp +++ b/libfec/Android.bp @@ -58,7 +58,7 @@ cc_defaults { "-DFEC_NO_KLOG", ], }, - linux_glibc: { + host_linux: { sanitize: { misc_undefined: ["integer"], }, diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp index b5edda80..58943931 100644 --- a/simpleperf/Android.bp +++ b/simpleperf/Android.bp @@ -131,6 +131,9 @@ cc_defaults { linux_glibc_x86_64: { stl: "libc++_static", }, + linux_musl_x86_64: { + stl: "libc++_static", + }, windows: { enabled: true, stl: "libc++_static", @@ -434,6 +437,16 @@ cc_binary { dir: "simpleperf/linux/x86_64", }, }, + linux_musl_x86: { + dist: { + dir: "simpleperf/linux_musl/x86", + }, + }, + linux_musl_x86_64: { + dist: { + dir: "simpleperf/linux_musl/x86_64", + }, + }, windows_x86: { dist: { dir: "simpleperf/windows/x86", @@ -518,6 +531,16 @@ cc_library_shared { dir: "simpleperf/linux/x86_64", }, }, + linux_musl_x86: { + dist: { + dir: "simpleperf/linux_musl/x86", + }, + }, + linux_musl_x86_64: { + dist: { + dir: "simpleperf/linux_musl/x86_64", + }, + }, windows_x86: { dist: { dir: "simpleperf/windows/x86", diff --git a/verity/fec/Android.bp b/verity/fec/Android.bp index 9ca45600..ede5fd19 100644 --- a/verity/fec/Android.bp +++ b/verity/fec/Android.bp @@ -25,6 +25,11 @@ cc_binary_host { misc_undefined: ["integer"], }, }, + linux_musl_x86_64: { + sanitize: { + misc_undefined: ["integer"], + }, + }, linux: { static_libs: [ "libavb", |