commit e85fb580c88d5423702272ecc93856ed86c1eef6
author Dmitriy Ivanov <dimitry@google.com> Wed Oct 28 17:24:43 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Wed Oct 28 17:25:34 2015 -0700
tree 5e35999e5c55587f752d9070319f279a84f9c368
parent 578d949e8df782134127b4ae384f731d9d7c6694

Fix LDFLAGS for arm and x86

Change-Id: I5366f4499cb4da3a51b8484ab3e4ff785f0888ab

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index e9ed523..bd51e7c 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -525,12 +525,12 @@
 LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
 LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both
 
-LOCAL_LDFLAGS_arm    := -Wl,--version-script,$(LOCAL_PATH)/libm.arm.map
-LOCAL_LDFLAGS_arm64  := -Wl,--version-script,$(LOCAL_PATH)/libm.arm64.map
-LOCAL_LDFLAGS_mips   := -Wl,--version-script,$(LOCAL_PATH)/libm.mips.map
-LOCAL_LDFLAGS_mips64 := -Wl,--version-script,$(LOCAL_PATH)/libm.mips64.map
-LOCAL_LDFLAGS_x86    := -Wl,--version-script,$(LOCAL_PATH)/libm.x86.map
-LOCAL_LDFLAGS_x86_64 := -Wl,--version-script,$(LOCAL_PATH)/libm.x86_64.map
+LOCAL_LDFLAGS_arm    += -Wl,--version-script,$(LOCAL_PATH)/libm.arm.map
+LOCAL_LDFLAGS_arm64  += -Wl,--version-script,$(LOCAL_PATH)/libm.arm64.map
+LOCAL_LDFLAGS_mips   += -Wl,--version-script,$(LOCAL_PATH)/libm.mips.map
+LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libm.mips64.map
+LOCAL_LDFLAGS_x86    += -Wl,--version-script,$(LOCAL_PATH)/libm.x86.map
+LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libm.x86_64.map
 
 
 LOCAL_MODULE := libm