summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Albert <danalbert@google.com> 2018-01-06 17:47:49 +0000
committer android-build-merger <android-build-merger@google.com> 2018-01-06 17:47:49 +0000
commit81da46f982a9e7f8e49b1a8d815389b4f3c5942a (patch)
treea59f35cba8cf88fcd0aaaffddc9e10b734cab4be
parent2d7813a4a779eec7152a4cdc93d8fc1ed833bc34 (diff)
parentc6dd5f9037bf5f9414ac23983d8a69291904102a (diff)
Merge "Move to libc++ from stlport."
am: c6dd5f9037 Change-Id: Ie42f0cf03a005215b96bbbef16ea62e541fb12a8
-rw-r--r--tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk
index 088f322ed324..6e0d58a2a881 100644
--- a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk
+++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk
@@ -40,6 +40,6 @@ LOCAL_SRC_FILES := contrast.cpp \
LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter
-LOCAL_NDK_STL_VARIANT := stlport_static
+LOCAL_NDK_STL_VARIANT := c++_static
include $(BUILD_SHARED_LIBRARY)