Move tests from deprecated STLs to libc++.

Test: ./run_tests.py --rebuild Bug: None Change-Id: Id054ab4f331421b5a94ad68c0f8461b8cf134d5a (cherry picked from commit ae2323ed3ea0795c431d7230cbca3db9ff9ccc61)
MIPS · Feb 13, 2018 · b292d4f · b292d4f
1 parent c098be0
commit b292d4f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/tests/build/c++-stl-source-extensions/jni/Application.mk b/tests/build/c++-stl-source-extensions/jni/Application.mk
@@ -1,2 +1 @@
-APP_STL := gnustl_static
-APP_ABI := all
+APP_STL := c++_static
diff --git a/tests/build/check-armeabi-v7a-prebuilts/build.sh b/tests/build/check-armeabi-v7a-prebuilts/build.sh
@@ -258,16 +258,10 @@ if [ ! -f "$ARM_READELF" ]; then
     exit 1
 fi
 
-STLPORT_LIBS=$NDK/sources/cxx-stl/stlport/libs/armeabi-v7a
-check_armv7_elf_binary $STLPORT_LIBS/libstlport_shared.so
-check_armv7_elf_binary $STLPORT_LIBS/libstlport_static.a
-
-
-for VERSION in $DEFAULT_GCC_VERSION_LIST; do
-    GNUSTL_LIBS=$NDK/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a
-    check_armv7_elf_binary $GNUSTL_LIBS/libsupc++.a
-    check_armv7_elf_binary $GNUSTL_LIBS/libgnustl_shared.so
-    check_armv7_elf_binary $GNUSTL_LIBS/libgnustl_static.a
-done
+LIBCXX_LIBS=$NDK/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a
+check_armv7_elf_binary $LIBCXX_LIBS/libandroid_support.a
+check_armv7_elf_binary $LIBCXX_LIBS/libc++_shared.so
+check_armv7_elf_binary $LIBCXX_LIBS/libc++_static.a
+check_armv7_elf_binary $LIBCXX_LIBS/libc++abi.a
 
 echo "Done!"
diff --git a/tests/build/rs-hello-compute/jni/Application.mk b/tests/build/rs-hello-compute/jni/Application.mk
@@ -14,4 +14,4 @@
 
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
 APP_PLATFORM := android-19
-APP_STL := stlport_shared
+APP_STL := c++_shared
diff --git a/tests/device/gtest/jni/Application.mk b/tests/device/gtest/jni/Application.mk
@@ -1,4 +1,4 @@
-APP_STL := stlport_static
+APP_STL := c++_static
 APP_MODULES := \
     gtest-filepath_test \
     gtest-linked_ptr_test \

diff --git a/tests/device/rs-cpp-basic/jni/Application.mk b/tests/device/rs-cpp-basic/jni/Application.mk
@@ -12,6 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips
 APP_PLATFORM := android-19
-APP_STL := stlport_static
+APP_STL := c++_static
diff --git a/tests/device/vulkan/jni/Application.mk b/tests/device/vulkan/jni/Application.mk
@@ -1,2 +1,2 @@
 APP_PLATFORM := android-24
-APP_STL := gnustl_shared
+APP_STL := c++_shared