diff options
| author | Dan Albert <danalbert@google.com> | 2018-01-04 14:53:03 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2018-01-04 14:53:03 -0800 |
| commit | 7ed79afd917b18284784fdc5ae76f856821fbae0 (patch) | |
| tree | 1adcf16c1d33da076ee06080e7a1e71ced109cea /tests | |
| parent | 5748a9826d91a9cc17f7d5c14eeb26af2b6830ee (diff) | |
| download | rs-7ed79afd917b18284784fdc5ae76f856821fbae0.tar.gz | |
Move to libc++ from stlport.
Test: make checkbuild
Bug: None
Change-Id: I6bda6ed73cf2eb561f00c941d564a88bd4c4ff54
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cpp_api/cpp-globalguard/Android.mk | 2 | ||||
| -rw-r--r-- | tests/cpp_api/cppallocation/Android.mk | 2 | ||||
| -rw-r--r-- | tests/cpp_api/cppbasic/Android.mk | 2 | ||||
| -rw-r--r-- | tests/cpp_api/cppf16/Android.mk | 2 | ||||
| -rw-r--r-- | tests/cpp_api/cppstrided/Android.mk | 2 | ||||
| -rw-r--r-- | tests/cpp_api/latency/Android.mk | 2 | ||||
| -rw-r--r-- | tests/cpp_api/typecheck/Android.mk | 2 | ||||
| -rw-r--r-- | tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/tests/cpp_api/cpp-globalguard/Android.mk b/tests/cpp_api/cpp-globalguard/Android.mk index 118c9fb3..b5929d89 100644 --- a/tests/cpp_api/cpp-globalguard/Android.mk +++ b/tests/cpp_api/cpp-globalguard/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= rstest-cpp-globalguard LOCAL_SDK_VERSION := 21 -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := c++_static LOCAL_SRC_FILES:= \ multiply.rs \ diff --git a/tests/cpp_api/cppallocation/Android.mk b/tests/cpp_api/cppallocation/Android.mk index f2c75c8a..d5786792 100644 --- a/tests/cpp_api/cppallocation/Android.mk +++ b/tests/cpp_api/cppallocation/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= rstest-cppallocation LOCAL_SDK_VERSION := 21 -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := c++_static LOCAL_SRC_FILES:= \ multiply.rs \ diff --git a/tests/cpp_api/cppbasic/Android.mk b/tests/cpp_api/cppbasic/Android.mk index 1c2a60b0..0074e36d 100644 --- a/tests/cpp_api/cppbasic/Android.mk +++ b/tests/cpp_api/cppbasic/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= rstest-compute LOCAL_SDK_VERSION := 21 -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := c++_static LOCAL_SRC_FILES:= \ mono.rs \ diff --git a/tests/cpp_api/cppf16/Android.mk b/tests/cpp_api/cppf16/Android.mk index 9ba469f5..b49dc1de 100644 --- a/tests/cpp_api/cppf16/Android.mk +++ b/tests/cpp_api/cppf16/Android.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= rstest-cppf16 -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := c++_static LOCAL_SRC_FILES:= \ compute.cpp diff --git a/tests/cpp_api/cppstrided/Android.mk b/tests/cpp_api/cppstrided/Android.mk index f3d85e58..f9805ef3 100644 --- a/tests/cpp_api/cppstrided/Android.mk +++ b/tests/cpp_api/cppstrided/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= rstest-cppstrided LOCAL_SDK_VERSION := 21 -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := c++_static LOCAL_SRC_FILES:= \ multiply.rs \ diff --git a/tests/cpp_api/latency/Android.mk b/tests/cpp_api/latency/Android.mk index d1fd35db..963363b5 100644 --- a/tests/cpp_api/latency/Android.mk +++ b/tests/cpp_api/latency/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= rstest-latency LOCAL_SDK_VERSION := 21 -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := c++_static LOCAL_SRC_FILES:= \ latency.rs \ diff --git a/tests/cpp_api/typecheck/Android.mk b/tests/cpp_api/typecheck/Android.mk index d3a15ed9..1895ed06 100644 --- a/tests/cpp_api/typecheck/Android.mk +++ b/tests/cpp_api/typecheck/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= rstest-typecheck LOCAL_SDK_VERSION := 21 -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := c++_static LOCAL_SRC_FILES:= \ kernels.rs \ diff --git a/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk b/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk index 37239640..09b4077d 100644 --- a/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk +++ b/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk @@ -32,6 +32,6 @@ LOCAL_STATIC_LIBRARIES := libRScpp_static LOCAL_SDK_VERSION := current -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := c++_static include $(BUILD_SHARED_LIBRARY) |