Switched libiconv jni files to use clang3.4

ras0219-msft · ras0219-msft · commit 081d999e7e5f · 2014-11-06T02:48:44.000-08:00
diff --git a/Build_android/libiconv/jni/Android.mk b/Build_android/libiconv/jni/Android.mk
@@ -11,14 +11,12 @@ LOCAL_CFLAGS    := \
     -Wno-static-in-inline \
     -Wno-tautological-compare \
     -Wno-parentheses-equality
-#    -DLIBICONV_PLUG
 
 LOCAL_C_INCLUDES := \
     ${LOCAL_PATH}/../libiconv-1.13.1 \
     ${LOCAL_PATH}/../libiconv-1.13.1/include \
     ${LOCAL_PATH}/../libiconv-1.13.1/lib \
     ${LOCAL_PATH}/../libiconv-1.13.1/libcharset/include
-LOCAL_LDLIBS += -static-libstdc++
 LOCAL_SRC_FILES := \
     ../libiconv-1.13.1/lib/iconv.c \
     ../libiconv-1.13.1/lib/relocatable.c \
diff --git a/Build_android/libiconv/jni/Application.mk b/Build_android/libiconv/jni/Application.mk
@@ -1,4 +1,4 @@
-NDK_TOOLCHAIN_VERSION := 4.8
-APP_STL := none
+NDK_TOOLCHAIN_VERSION := clang3.4
+APP_STL := gnustl_static
 APP_PLATFORM := android-9
 APP_ABI := armeabi-v7a
