Make the bug 24465209 workaround implementation clearer.
Or at least "less intermingled with unrelated configuration".
Change-Id: I2551e58c3a710e0be0efd39cf70fe7f95604f3ca
diff --git a/libm/Android.bp b/libm/Android.bp
index cc37fb7..09d8535 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -21,7 +21,10 @@
cc_library {
name: "libm",
- defaults: ["linux_bionic_supported"],
+ defaults: [
+ "linux_bionic_supported",
+ "bug_24465209_workaround",
+ ],
ramdisk_available: true,
vendor_ramdisk_available: true,
recovery_available: true,
@@ -282,8 +285,6 @@
"upstream-freebsd/lib/msun/src/s_ceilf.c",
],
instruction_set: "arm",
- pack_relocations: false,
- ldflags: ["-Wl,--hash-style=both"],
version_script: ":libm.arm.map",
no_libcrt: true,
shared: {
@@ -368,11 +369,9 @@
"upstream-freebsd/lib/msun/src/s_truncf.c",
],
local_include_dirs: ["i387"],
- pack_relocations: false,
// The x86 ABI doesn't include this, which is needed for the
// roundss/roundsd instructions that we've used since Android M.
cflags: ["-msse4.1"],
- ldflags: ["-Wl,--hash-style=both"],
version_script: ":libm.x86.map",
},