Fix x86 build (problems spotted by StrictMath tests).
Bug: 2931959
(Cherry-pick from master.)
Change-Id: I50bd01b2292ec40f140683e5ab368271afb74ec3
diff --git a/Android.mk b/Android.mk
index eccdb70..4b1f502 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,6 +45,12 @@
# are used.
cflags := "-D_LIB_VERSION_TYPE=\"const enum _IEEE_\""
+# Disable GCC optimizations that interact badly with this crufty
+# library (see their own admission in 'readme'). Without this, we
+# fail StrictMath tests on x86.
+cflags += "-fno-strict-aliasing"
+cflags += "-ffloat-store"
+
#
# Build for the target (device).
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b6..0d2142a 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -47,3 +47,5 @@
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/obj/STATIC_LIBRARIES/libfdlibm-host_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libfdlibm_intermediates)
