Merge "[MIPS] Build fdlibm in forced IEEE mode"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2tools_r22kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-dev-plus-aospidea133

1 files changed, 3 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index ef64cfc..9e84bc3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -43,7 +43,7 @@ src_files := \
 # 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 @@ ifneq ($(filter $(TARGET_ARCH),arm x86),)
 endif
 
 LOCAL_MODULE := libfdlibm
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -89,6 +90,7 @@ ifeq ($(WITH_HOST_DALVIK),true)
     endif
 
     LOCAL_MODULE := libfdlibm
+    LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
     include $(BUILD_HOST_STATIC_LIBRARY)