diff options
| author | Richard Hansen <cyanogenmod@rhansen.org> | 2013-02-19 13:43:18 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-02-27 21:22:08 -0800 |
| commit | 1e297188104f152edc61a60812b244aa8c6427c2 (patch) | |
| tree | 20d0902c3c58ac22fb1d55f58b19e9ec6cd607f6 | |
| parent | c8c796633fa81a94899f1966ef74d026b41ab2fe (diff) | |
| download | bionic-1e297188104f152edc61a60812b244aa8c6427c2.zip bionic-1e297188104f152edc61a60812b244aa8c6427c2.tar.gz bionic-1e297188104f152edc61a60812b244aa8c6427c2.tar.bz2 | |
bionic/libm: fix x86 support regression
Support for x86 and MIPS broke due to an incorrect merge conflict
resolution in commit 5015fe9. Commit d348cd5 repaired MIPS support
but not x86. This commit repairs the incorrect merge conflict
resolution, bringing back support for x86 (and potential future
architectures).
Change-Id: I8994d653e5a2f79c9bfacb1c87159c8cdd4f81a7
| -rw-r--r-- | libm/Android.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libm/Android.mk b/libm/Android.mk index 23fbe02..1f76366 100644 --- a/libm/Android.mk +++ b/libm/Android.mk @@ -177,6 +177,11 @@ ifeq ($(TARGET_ARCH),arm) endif libm_common_includes = $(LOCAL_PATH)/arm + +else + libm_common_src_files += \ + src/s_cos.c \ + src/s_sin.c endif ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86) @@ -196,9 +201,7 @@ ifeq ($(TARGET_ARCH),mips) src/s_scalbln.c \ src/s_scalbn.c \ src/s_scalbnf.c \ - src/e_sqrtf.c \ - src/s_sin.c \ - src/s_cos.c + src/e_sqrtf.c libm_common_includes = $(LOCAL_PATH)/mips # Need to build *rint* functions @@ -217,8 +220,6 @@ LOCAL_ARM_MODE := arm LOCAL_C_INCLUDES += $(libm_common_includes) LOCAL_CFLAGS := $(libm_common_cflags) -LOCAL_CFLAGS:= $(libm_common_cflags) - LOCAL_MODULE:= libm LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -239,8 +240,6 @@ LOCAL_ARM_MODE := arm LOCAL_C_INCLUDES += $(libm_common_includes) LOCAL_CFLAGS := $(libm_common_cflags) -LOCAL_CFLAGS:= $(libm_common_cflags) - LOCAL_MODULE:= libm LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk |