aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2022-03-08 15:12:46 -0800
committerColin Cross <ccross@android.com>2022-03-08 15:12:46 -0800
commita58af67e6ef1acdfc415fec0b95df16dbd685868 (patch)
treefb9ded0f62ba472ba9110b4d8347cbc60bb921da
parent561e441fd659fdc51e033cd8f4122a5c7a63ed3c (diff)
downloadgoogle-breakpad-a58af67e6ef1acdfc415fec0b95df16dbd685868.tar.gz
Tweak linux_glibc properties for musl builds in external/google-breakpad
For convenience, builds against musl libc currently use the linux_glibc properties because they are almost always linux-specific and not glibc-specific. In preparation for removing this hack, tweak the linux_glibc properties by either moving them to host_linux, which will apply to linux_glibc, linux_musl and linux_bionic, or by setting appropriate musl or linux_musl properties. Properties that must not be repeated while musl uses linux_musl and also still uses the linux_glibc properties are moved to glibc properties, which don't apply to musl. Whether these stay as glibc properties or get moved back to linux_glibc later once the musl hack is removed is TBD. Bug: 223257095 Test: m checkbuild Test: m USE_HOST_MUSL=true host-native Change-Id: Ide6c1c5b26182229c55ec7312dfb1a905af89555
-rw-r--r--Android.bp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 3cc8e2fe..e0cd1593 100644
--- a/Android.bp
+++ b/Android.bp
@@ -147,7 +147,7 @@ cc_binary_host {
"src/common/musl/include",
],
},
- linux_glibc: {
+ host_linux: {
cppflags: [
"-Wno-unused-parameter",
],
@@ -197,7 +197,7 @@ cc_binary_host {
darwin: {
enabled: false,
},
- linux_glibc: {
+ host_linux: {
srcs: [
"src/common/linux/http_upload.cc",
"src/common/linux/libcurl_wrapper.cc",
@@ -223,7 +223,7 @@ cc_library_host_static {
darwin: {
enabled: false,
},
- linux_glibc: {
+ host_linux: {
cflags: [
"-Wno-missing-field-initializers",
"-Wno-pointer-arith",
@@ -259,7 +259,7 @@ cc_binary_host {
darwin: {
enabled: false,
},
- linux_glibc: {
+ host_linux: {
cppflags: [
"-DHAVE_A_OUT_H",
"-Wno-implicit-fallthrough",