[RenderScript] Make support lib use c++_static instead of
stlport_static.
Bug: 27230989
Change-Id: Ia31a0868ef9e21ac98b7da81fb6daa4a4f49669a
(cherry picked from commit 810fd8ca9f301fd0c1efa873e26fcd26c70b944c)
diff --git a/v8/renderscript/jni/Android.mk b/v8/renderscript/jni/Android.mk
index 72f8720..2e8fa62 100644
--- a/v8/renderscript/jni/Android.mk
+++ b/v8/renderscript/jni/Android.mk
@@ -21,7 +21,8 @@
LOCAL_MODULE_TAGS := optional
LOCAL_LDLIBS += -landroid
-LOCAL_NDK_STL_VARIANT := stlport_static
+LOCAL_LDFLAGS += -ldl -Wl,--exclude-libs,libc++_static.a
+LOCAL_NDK_STL_VARIANT := c++_static
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
@@ -36,7 +37,6 @@
libjnigraphics
LOCAL_STATIC_LIBRARIES := \
- libcutils \
libRSDispatch
LOCAL_C_INCLUDES += \
@@ -50,6 +50,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_REQUIRED_MODULES := libRSSupport
-LOCAL_LDFLAGS += -ldl -llog
+LOCAL_LDFLAGS += -ldl -llog -Wl,--exclude-libs,libc++_static.a
+LOCAL_NDK_STL_VARIANT := c++_static
include $(BUILD_SHARED_LIBRARY)
diff --git a/v8/renderscript/rs_support/Android.mk b/v8/renderscript/rs_support/Android.mk
index 27966de..8e5885a 100644
--- a/v8/renderscript/rs_support/Android.mk
+++ b/v8/renderscript/rs_support/Android.mk
@@ -151,10 +151,9 @@
LOCAL_REQUIRED_MODULES := libblasV8
LOCAL_STATIC_LIBRARIES := libbnnmlowpV8
-LOCAL_LDFLAGS += -llog -ldl
-LOCAL_NDK_STL_VARIANT := stlport_static
+LOCAL_LDFLAGS += -llog -ldl -Wl,--exclude-libs,libc++_static.a
+LOCAL_NDK_STL_VARIANT := c++_static
-LOCAL_C_INCLUDES += frameworks/compile/libbcc/include
LOCAL_C_INCLUDES += external/cblas/include
LOCAL_C_INCLUDES += external/gemmlowp/eight_bit_int_gemm
