Create/use libportable.wrap file containing lines of "--wrap=symbol"

Change-Id: Ibad600a94612f5bfd0c36204bcf73a8d572ebf3f

8 files changed, 14 insertions, 6 deletions

diff --git a/toolchains/arm-linux-androideabi-clang3.1/setup.mk b/toolchains/arm-linux-androideabi-clang3.1/setup.mk
index 78bcc774e..1d71279da 100644
--- a/toolchains/arm-linux-androideabi-clang3.1/setup.mk
+++ b/toolchains/arm-linux-androideabi-clang3.1/setup.mk
@@ -54,7 +54,7 @@ TARGET_CFLAGS := \
     -fstack-protector \
     -no-canonical-prefixes
 
-TARGET_LDFLAGS := \
+TARGET_LDFLAGS += \
     -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
     -no-canonical-prefixes
 
diff --git a/toolchains/arm-linux-androideabi-clang3.2/setup.mk b/toolchains/arm-linux-androideabi-clang3.2/setup.mk
index acf87b9ae..786f66839 100644
--- a/toolchains/arm-linux-androideabi-clang3.2/setup.mk
+++ b/toolchains/arm-linux-androideabi-clang3.2/setup.mk
@@ -54,7 +54,7 @@ TARGET_CFLAGS := \
     -fstack-protector \
     -no-canonical-prefixes
 
-TARGET_LDFLAGS := \
+TARGET_LDFLAGS += \
     -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
     -no-canonical-prefixes
 
diff --git a/toolchains/llvm-3.1/setup.mk b/toolchains/llvm-3.1/setup.mk
index 24e1baf95..64be1da4a 100644
--- a/toolchains/llvm-3.1/setup.mk
+++ b/toolchains/llvm-3.1/setup.mk
@@ -29,6 +29,7 @@ SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-arm/gdbserver/gdbserver
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/armeabi-v7a
 TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/armeabi-v7a/libportable.a $(TARGET_LDLIBS)
+TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/armeabi-v7a/libportable.wrap
 include $(NDK_ROOT)/toolchains/arm-linux-androideabi-clang3.1/setup.mk
 
 else
@@ -38,6 +39,7 @@ SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-arm/gdbserver/gdbserver
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/armeabi
 TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/armeabi/libportable.a $(TARGET_LDLIBS)
+TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/armeabi/libportable.wrap
 include $(NDK_ROOT)/toolchains/arm-linux-androideabi-clang3.1/setup.mk
 
 else
@@ -47,6 +49,7 @@ SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-x86
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-x86/gdbserver/gdbserver
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/x86
 TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/x86/libportable.a $(TARGET_LDLIBS)
+TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/x86/libportable.wrap
 include $(NDK_ROOT)/toolchains/x86-clang3.1/setup.mk
 
 else
@@ -56,6 +59,7 @@ SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-mips
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-mips/gdbserver/gdbserver
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/mips
 TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/mips/libportable.a $(TARGET_LDLIBS)
+TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/mips/libportable.wrap
 include $(NDK_ROOT)/toolchains/mipsel-linux-android-clang3.1/setup.mk
 
 else
diff --git a/toolchains/llvm-3.2/setup.mk b/toolchains/llvm-3.2/setup.mk
index 2531ee5a0..4fd949687 100644
--- a/toolchains/llvm-3.2/setup.mk
+++ b/toolchains/llvm-3.2/setup.mk
@@ -29,6 +29,7 @@ SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-arm/gdbserver/gdbserver
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/armeabi-v7a
 TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/armeabi-v7a/libportable.a $(TARGET_LDLIBS)
+TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/armeabi-v7a/libportable.wrap
 include $(NDK_ROOT)/toolchains/arm-linux-androideabi-clang3.2/setup.mk
 
 else
@@ -38,6 +39,7 @@ SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-arm/gdbserver/gdbserver
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/armeabi
 TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/armeabi/libportable.a $(TARGET_LDLIBS)
+TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/armeabi/libportable.wrap
 include $(NDK_ROOT)/toolchains/arm-linux-androideabi-clang3.2/setup.mk
 
 else
@@ -47,6 +49,7 @@ SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-x86
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-x86/gdbserver/gdbserver
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/x86
 TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/x86/libportable.a $(TARGET_LDLIBS)
+TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/x86/libportable.wrap
 include $(NDK_ROOT)/toolchains/x86-clang3.2/setup.mk
 
 else
@@ -56,6 +59,7 @@ SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-mips
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-mips/gdbserver/gdbserver
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/mips
 TARGET_LDLIBS    := $(NDK_ROOT)/sources/android/libportable/libs/mips/libportable.a $(TARGET_LDLIBS)
+TARGET_LDFLAGS   += -Wl,@$(NDK_ROOT)/sources/android/libportable/libs/mips/libportable.wrap
 include $(NDK_ROOT)/toolchains/mipsel-linux-android-clang3.2/setup.mk
 
 else
diff --git a/toolchains/mipsel-linux-android-clang3.1/setup.mk b/toolchains/mipsel-linux-android-clang3.1/setup.mk
index ab6a9a6ef..39708b403 100644
--- a/toolchains/mipsel-linux-android-clang3.1/setup.mk
+++ b/toolchains/mipsel-linux-android-clang3.1/setup.mk
@@ -59,7 +59,7 @@ TARGET_CFLAGS := \
         -fmessage-length=0 \
         -no-canonical-prefixes
 
-TARGET_LDFLAGS := \
+TARGET_LDFLAGS += \
         -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
         -target $(LLVM_TRIPLE) \
         -no-canonical-prefixes
diff --git a/toolchains/mipsel-linux-android-clang3.2/setup.mk b/toolchains/mipsel-linux-android-clang3.2/setup.mk
index f1d96f3a3..3947a8597 100644
--- a/toolchains/mipsel-linux-android-clang3.2/setup.mk
+++ b/toolchains/mipsel-linux-android-clang3.2/setup.mk
@@ -59,7 +59,7 @@ TARGET_CFLAGS := \
         -fmessage-length=0 \
         -no-canonical-prefixes
 
-TARGET_LDFLAGS := \
+TARGET_LDFLAGS += \
         -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
         -target $(LLVM_TRIPLE) \
         -no-canonical-prefixes
diff --git a/toolchains/x86-clang3.1/setup.mk b/toolchains/x86-clang3.1/setup.mk
index dc84db8c9..82d29a361 100644
--- a/toolchains/x86-clang3.1/setup.mk
+++ b/toolchains/x86-clang3.1/setup.mk
@@ -57,7 +57,7 @@ TARGET_C_INCLUDES := \
     $(SYSROOT_INC)/usr/include
 
 # Add and LDFLAGS for the target here
-TARGET_LDFLAGS := \
+TARGET_LDFLAGS += \
     -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
     -target $(LLVM_TRIPLE) \
     -no-canonical-prefixes
diff --git a/toolchains/x86-clang3.2/setup.mk b/toolchains/x86-clang3.2/setup.mk
index e8fd7766c..3ca57242c 100644
--- a/toolchains/x86-clang3.2/setup.mk
+++ b/toolchains/x86-clang3.2/setup.mk
@@ -57,7 +57,7 @@ TARGET_C_INCLUDES := \
     $(SYSROOT_INC)/usr/include
 
 # Add and LDFLAGS for the target here
-TARGET_LDFLAGS := \
+TARGET_LDFLAGS += \
     -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
     -target $(LLVM_TRIPLE) \
     -no-canonical-prefixes