commit a59b20609e036604d864b341f099316f22d89f09
author Lance Chang <jinwoong@google.com> Tue Jul 26 16:18:41 2016 -0700
committer Daniel Xie <dxie@google.com> Thu Jul 28 01:57:34 2016 +0000
tree fe7c39c848485bccf32b0c7a47704fca4071fdd6
parent aa981d506d944cf8b1eed84e7718f9b4eef9fdd8

JNI libraries in CtsVerifier should use libstdc++ STL

Android Build system uses libc++ by default if LOCAL_CXX_STL is
undefined. However, Android N introduced b/28250179, which prevents
the 3rd party apps from linking to libc++ in the system partition.

Bug: 30399537
Change-Id: I980f150df1675c3054546d89a1197626b53949c1
(cherry picked from commit a34c8745e16837f9ab20be1248d2a8bdcda77786)

apps/CtsVerifier/jni/verifier/Android.mk

diff --git a/apps/CtsVerifier/jni/verifier/Android.mk b/apps/CtsVerifier/jni/verifier/Android.mk
index 4840e62..2978b06 100644
--- a/apps/CtsVerifier/jni/verifier/Android.mk
+++ b/apps/CtsVerifier/jni/verifier/Android.mk
@@ -32,4 +32,6 @@
 
 LOCAL_SHARED_LIBRARIES := liblog
 
+LOCAL_CXX_STL := libstdc++
+
 include $(BUILD_SHARED_LIBRARY)