Merge "More fix to llvm-3.?/setup.mk"
diff --git a/build/tools/build-libportable.sh b/build/tools/build-libportable.sh
index 646d814..75c8a5b 100755
--- a/build/tools/build-libportable.sh
+++ b/build/tools/build-libportable.sh
@@ -134,7 +134,7 @@
if [ -z "$VISIBLE_LIBLIBPORTABLE_STATIC" ]; then
# No -fvisibility-inlines-hidden because it is for C++, and there is
# no C++ code in libportable
- builder_cflags "$LIBPORTABLE_CFLAGS -fvisibility=hidden"
+ builder_cflags "$LIBPORTABLE_CFLAGS" # ToDo: -fvisibility=hidden
else
builder_cflags "$LIBPORTABLE_CFLAGS"
fi
diff --git a/toolchains/llvm-3.1/setup.mk b/toolchains/llvm-3.1/setup.mk
index 64be1da..49b105c 100644
--- a/toolchains/llvm-3.1/setup.mk
+++ b/toolchains/llvm-3.1/setup.mk
@@ -27,7 +27,8 @@
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_ARCH_ABI := armeabi-v7a
+NDK_APP_DST_DIR := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
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
@@ -37,7 +38,8 @@
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_ARCH_ABI := armeabi
+NDK_APP_DST_DIR := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
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
@@ -47,7 +49,8 @@
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_ARCH_ABI := x86
+NDK_APP_DST_DIR := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
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
@@ -57,7 +60,8 @@
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_ARCH_ABI := mips
+NDK_APP_DST_DIR := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
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
diff --git a/toolchains/llvm-3.2/setup.mk b/toolchains/llvm-3.2/setup.mk
index 4fd9496..e526404 100644
--- a/toolchains/llvm-3.2/setup.mk
+++ b/toolchains/llvm-3.2/setup.mk
@@ -27,7 +27,8 @@
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_ARCH_ABI := armeabi-v7a
+NDK_APP_DST_DIR := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
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
@@ -37,7 +38,8 @@
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_ARCH_ABI := armeabi
+NDK_APP_DST_DIR := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
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
@@ -47,7 +49,8 @@
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_ARCH_ABI := x86
+NDK_APP_DST_DIR := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
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
@@ -57,7 +60,8 @@
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_ARCH_ABI := mips
+NDK_APP_DST_DIR := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
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
