commit bc75047a1b0e68006077ea2e5f798475c90cbad0
author Dmitriy Ivanov <dimitry@google.com> Fri Oct 30 17:43:27 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri Oct 30 17:43:27 2015 -0700
tree 7c94f45c3cdad194c42241db85fccf21dd35ff53
parent e75453d5dd8b373f6e7ef61ec22a6a3074d51e02

Generate libdl.so per-architecture version script

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

libdl/Android.mk

diff --git a/libdl/Android.mk b/libdl/Android.mk
index 4ab32e0..9a9c756 100644
--- a/libdl/Android.mk
+++ b/libdl/Android.mk
@@ -15,12 +15,19 @@
 #
 # DO NOT REMOVE --exclude-libs!
 
-LOCAL_LDFLAGS := -Wl,--exclude-libs=libgcc.a -Wl,--version-script=$(LOCAL_PATH)/libdl.map
+LOCAL_LDFLAGS := -Wl,--exclude-libs=libgcc.a
 
 # for x86, exclude libgcc_eh.a for the same reasons as above
 LOCAL_LDFLAGS_x86 := -Wl,--exclude-libs=libgcc_eh.a
 LOCAL_LDFLAGS_x86_64 := $(LOCAL_LDFLAGS_x86)
 
+LOCAL_LDFLAGS_arm    += -Wl,--version-script=$(LOCAL_PATH)/libdl.arm.map
+LOCAL_LDFLAGS_arm64  += -Wl,--version-script=$(LOCAL_PATH)/libdl.arm64.map
+LOCAL_LDFLAGS_mips   += -Wl,--version-script=$(LOCAL_PATH)/libdl.mips.map
+LOCAL_LDFLAGS_mips64 += -Wl,--version-script=$(LOCAL_PATH)/libdl.mips64.map
+LOCAL_LDFLAGS_x86    += -Wl,--version-script=$(LOCAL_PATH)/libdl.x86.map
+LOCAL_LDFLAGS_x86_64 += -Wl,--version-script=$(LOCAL_PATH)/libdl.x86_64.map
+
 LOCAL_SRC_FILES:= libdl.c
 LOCAL_CFLAGS := -Wall -Wextra -Wunused -Werror
 LOCAL_CXX_STL := none