diff options
author | Elliott Hughes <enh@google.com> | 2013-12-19 19:22:42 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-19 19:22:43 +0000 |
commit | 7c7fad18d0277533f25e9ddc47c61764911d7482 (patch) | |
tree | b9b7d3a1417e1acbe99cc7d3e8ada0b93d2eb0db | |
parent | 0da5f683c9ddc9442af3b389b4220e91ccffb320 (diff) | |
parent | 67cc0e474599fc1a896164da3170af6e8efb5378 (diff) | |
download | fdlibm-idea133-weekly-release.tar.gz |
Merge "Android is little endian."idea133-weekly-release
-rw-r--r-- | Android.mk | 20 |
1 files changed, 3 insertions, 17 deletions
@@ -45,6 +45,9 @@ src_files := \ # are used. cflags := "-D_IEEE_LIBM" +# Android only supports little-endian. +cflags += "-D__LITTLE_ENDIAN" + # Disable GCC optimizations that interact badly with this crufty # library (see their own admission in 'readme'). Without this, we # fail StrictMath tests on x86. @@ -57,19 +60,10 @@ cflags += "-ffloat-store" # include $(CLEAR_VARS) - LOCAL_SRC_FILES:= $(src_files) LOCAL_CFLAGS := $(cflags) - -ifneq ($(filter $(TARGET_ARCH),arm x86),) - # When __LITTLE_ENDIAN is set, the source will compile for - # little endian cpus. - LOCAL_CFLAGS += "-D__LITTLE_ENDIAN" -endif - LOCAL_MODULE := libfdlibm LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - include $(BUILD_STATIC_LIBRARY) @@ -80,18 +74,10 @@ include $(BUILD_STATIC_LIBRARY) ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) - LOCAL_SRC_FILES:= $(src_files) LOCAL_CFLAGS := $(cflags) - - ifneq ($(filter $(HOST_ARCH),arm x86),) - # See similar section above. - LOCAL_CFLAGS += "-D__LITTLE_ENDIAN" - endif - LOCAL_MODULE := libfdlibm LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - include $(BUILD_HOST_STATIC_LIBRARY) endif |