diff options
| author | Colin Cross <ccross@android.com> | 2022-03-30 01:07:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-30 01:07:07 +0000 |
| commit | 77b1373b60e11864f6ddd97014dff364d5b2d68f (patch) | |
| tree | 9c9f7c6de7e82c26d050446f3171b4aa09d505e5 | |
| parent | c3389b057170cb0571f09b3fb7de1afb01dc59a7 (diff) | |
| parent | 378918ad3bc3009ccab7d5747a8feec9e9dc1c49 (diff) | |
| download | extras-77b1373b60e11864f6ddd97014dff364d5b2d68f.tar.gz | |
Merge "Tweak linux_glibc properties for musl builds in system/extras" am: 5cb11a82cc am: 8a4c799617 am: 378918ad3b
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2044007
Change-Id: I52eaf6223fe29f51af420ded36f30b3f4da77325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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", |