commit a208caf02e345a3cba44b010a95de5927abac62e
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 19 16:16:33 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 19 16:16:33 2018 +0000
tree 0c01fc3260a031d0c27b5120e1f7968fc42a375c
parent 6cb3c4d7b09421c9850a97b71e444a7b401d3459
parent c3e0829dd493065c9e136e0c4f09cbbb7d5a0c11

Merge "Fix link-type warning on CtsPermissionTestCases"

tests/tests/permission/jni/Android.mk

diff --git a/tests/tests/permission/jni/Android.mk b/tests/tests/permission/jni/Android.mk
index 1d4d77d..96b7506 100644
--- a/tests/tests/permission/jni/Android.mk
+++ b/tests/tests/permission/jni/Android.mk
@@ -28,9 +28,8 @@
 LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) 
 
 LOCAL_SHARED_LIBRARIES := libnativehelper_compat_libc++ liblog
-LOCAL_SDK_VERSION := 23
 LOCAL_CPPFLAGS := -std=gnu++11
-LOCAL_NDK_STL_VARIANT := c++_static
+LOCAL_CXX_STL := libc++_static
 
 LOCAL_CFLAGS := -Wno-unused-parameter -Wall -Werror