commit 636f5ddddcd9e0bcfc7139b0905ebc92d4adc40a
author Dmitriy Ivanov <dimitry@google.com> Thu Jun 04 18:30:51 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Mon Jun 15 18:52:20 2015 -0700
tree ddc7ed8efc00f03f69510ee7925915d0c9c2d1b5
parent 713ae464abb942dafcafd738d9e00fcc8c3bb601

Add versions to libm.so symbols

Bug: http://b/20139821
Change-Id: Ifdfcac62d59eb8f0985990aa8512046ecb87449e

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index 1e29396..f588183 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -505,10 +505,14 @@
 # -----------------------------------------------------------------------------
 include $(CLEAR_VARS)
 
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/libm.map
+
 # TODO: This is to work around b/19059885. 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_MODULE := libm
 LOCAL_CLANG := true
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc