commit 0c75e918567dc6a57040177c00d5fc6815c4574c
author Jeff Tinker <jtinker@google.com> Wed Jan 13 17:45:35 2016 -0800
committer Jeff Tinker <jtinker@google.com> Fri Jan 15 13:10:56 2016 -0800
tree e7e27cd873200905f0ffc33a61ee6c567951d7fb
parent 54c748d2e686e5c0e7262ee6e613c865f7b2e616

Fix testInstallDrmEngine dlopen fail on libc++.so

bug: 26519758
Change-Id: I2dc8d33de8143b39c7a044b405cb325379b7456d

tests/tests/drm/jni/Android.mk

diff --git a/tests/tests/drm/jni/Android.mk b/tests/tests/drm/jni/Android.mk
index 87f00a4..bb82e37 100644
--- a/tests/tests/drm/jni/Android.mk
+++ b/tests/tests/drm/jni/Android.mk
@@ -29,5 +29,6 @@
 
 LOCAL_SHARED_LIBRARIES := liblog libdl
 LOCAL_SDK_VERSION := 23
+LOCAL_CXX_STL := libc++_static
 
 include $(BUILD_SHARED_LIBRARY)

tests/tests/drm/lib/Android.mk

diff --git a/tests/tests/drm/lib/Android.mk b/tests/tests/drm/lib/Android.mk
index 3ebc4a0..fef6b87 100644
--- a/tests/tests/drm/lib/Android.mk
+++ b/tests/tests/drm/lib/Android.mk
@@ -28,10 +28,12 @@
 	$(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include
 
 LOCAL_SHARED_LIBRARIES := \
-	liblog \
-	libutils
+	liblog
+
+LOCAL_CXX_STL := libc++_static
 
 LOCAL_STATIC_LIBRARIES := \
-	libdrmframeworkcommon
+	libdrmframeworkcommon \
+	libutils
 
 include $(BUILD_SHARED_LIBRARY)