commit c9cc592955aa19d4441ebca8923a95003779ac26
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Mar 09 00:44:48 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 00:44:48 2018 +0000
tree 5e54b95a443c093862773a1e2e19ff191c104230
parent 2e4d1069923bb5cbc6e54f0db402dbbc1ec51035
parent 92380f2992e15429a823d6842f94219adfd2f76b

Merge "Merge "Merge changes I8a3bfd97,I363fa70b,Ie53e3314 into nougat-mr1-cts-dev am: 2516c859de" into oreo-cts-dev am: 0f6153fc97 am: d25bbb0969 am: 18e31b584d am: 664c76c90e" into pi-dev

tests/tests/mediastress/jni/Android.mk

diff --git a/tests/tests/mediastress/jni/Android.mk b/tests/tests/mediastress/jni/Android.mk
index 139aa00..66ca05e 100644
--- a/tests/tests/mediastress/jni/Android.mk
+++ b/tests/tests/mediastress/jni/Android.mk
@@ -27,7 +27,8 @@
 LOCAL_C_INCLUDES += $(call include-path-for, wilhelm)
 
 LOCAL_SHARED_LIBRARIES := libandroid libnativehelper_compat_libc++ liblog libOpenMAXAL
-LOCAL_CXX_STL := libc++_static
+LOCAL_NDK_STL_VARIANT := none
+LOCAL_SDK_VERSION := current
 
 LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-unused-variable
 

tests/tests/opengl/libopengltest/Android.mk

diff --git a/tests/tests/opengl/libopengltest/Android.mk b/tests/tests/opengl/libopengltest/Android.mk
index 8c45c38..aed011a 100755
--- a/tests/tests/opengl/libopengltest/Android.mk
+++ b/tests/tests/opengl/libopengltest/Android.mk
@@ -36,7 +36,8 @@
 
 LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
 
-LOCAL_CXX_STL := libc++_static
+LOCAL_SDK_VERSION := current
+LOCAL_NDK_STL_VARIANT := none
 
 LOCAL_SHARED_LIBRARIES := libGLESv2 liblog