commit 284b4685246197890b4f75a9912096b8e13c62ba
author Dmitriy Ivanov <dimitry@google.com> Wed Oct 28 15:14:13 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Wed Oct 28 16:40:53 2015 -0700
tree 867725cd196b02582edd6dcc0f95b5c40a4d7688
parent d9146c24041ad571e3725ab630d9ac94df3ff6d1

Generate per-architecture version scripts.

Bug: http://b/24767418
Change-Id: I23e49d8d30c0def3215ffbd99d09f207d9483624

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index f6c49aa..e9ed523 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -513,13 +513,25 @@
 # -----------------------------------------------------------------------------
 include $(CLEAR_VARS)
 
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/libm.map
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+    $(LOCAL_PATH)/libm.arm.map \
+    $(LOCAL_PATH)/libm.arm64.map \
+    $(LOCAL_PATH)/libm.mips.map \
+    $(LOCAL_PATH)/libm.mips64.map \
+    $(LOCAL_PATH)/libm.x86.map \
+    $(LOCAL_PATH)/libm.x86_64.map \
 
 # TODO: This is to work around b/24465209. Remove after root cause is fixed
 LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
 LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both
 
-LOCAL_LDFLAGS := -Wl,--version-script,$(LOCAL_PATH)/libm.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
 LOCAL_CLANG := $(libm_clang)