media: do not use libnativehelper in jni
Bug:26519812
Change-Id: I170b5d98576220168c5721ae750f47f8c8ca5358
diff --git a/tests/tests/mediastress/Android.mk b/tests/tests/mediastress/Android.mk
index 38d8bf6..fb00f03 100644
--- a/tests/tests/mediastress/Android.mk
+++ b/tests/tests/mediastress/Android.mk
@@ -30,7 +30,7 @@
LOCAL_HOST_SHARED_LIBRARIES := compatibility-device-media-preconditions
-LOCAL_JNI_SHARED_LIBRARIES := libctsmediastress_jni
+LOCAL_JNI_SHARED_LIBRARIES := libctsmediastress_jni libnativehelper_compat_libc++
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/mediastress/jni/Android.mk b/tests/tests/mediastress/jni/Android.mk
index 26ff647..164e302 100644
--- a/tests/tests/mediastress/jni/Android.mk
+++ b/tests/tests/mediastress/jni/Android.mk
@@ -26,6 +26,7 @@
LOCAL_C_INCLUDES += $(call include-path-for, wilhelm)
-LOCAL_SHARED_LIBRARIES := libandroid libnativehelper liblog libOpenMAXAL
+LOCAL_SHARED_LIBRARIES := libandroid libnativehelper_compat_libc++ liblog libOpenMAXAL
+LOCAL_CXX_STL := libc++_static
include $(BUILD_SHARED_LIBRARY)
