diff options
| author | Dan Albert <danalbert@google.com> | 2018-01-08 21:25:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-08 21:25:59 +0000 |
| commit | 48d23981251cf3053a06e2d9e8f7dff0897ecff7 (patch) | |
| tree | aaf7f9e8e03ab5264df570c73601861dfd378cdd /tests | |
| parent | 95820bc4df43623b499af0534391f5dc00b88be7 (diff) | |
| parent | eff28b58632ce2d322ece68a983bb36de4e78181 (diff) | |
Merge "Move to libc++ from stlport." am: c6dd5f9037 am: 81da46f982
am: eff28b5863
Change-Id: Ia45b5a174feaddff5e5839a231af18fb5bb3cb7a
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk | 2 |
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) |