Merge "[MIPS] Build fdlibm in forced IEEE mode"
diff --git a/Android.mk b/Android.mk
index ef64cfc..9e84bc3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -43,7 +43,7 @@
 # This is necessary to guarantee that the FDLIBM functions are in
 # "IEEE spirit", i.e. to guarantee that the IEEE 754 core functions
 # are used.
-cflags := "-D_LIB_VERSION_TYPE=\"const enum _IEEE_\""
+cflags := "-D_IEEE_LIBM"
 
 # Disable GCC optimizations that interact badly with this crufty
 # library (see their own admission in 'readme'). Without this, we
@@ -68,6 +68,7 @@
 endif
 
 LOCAL_MODULE := libfdlibm
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -89,6 +90,7 @@
     endif
 
     LOCAL_MODULE := libfdlibm
+    LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
     include $(BUILD_HOST_STATIC_LIBRARY)