Build gtest with NDK 9 for all architectures.
That gives us real regular expressions on all architectures, which lets us
pass more of gtest's own unit tests.
Change-Id: I05f0232ba9cac485018e3764fa7e8910d19bd8f3
diff --git a/src/Android.mk b/src/Android.mk
index 477c79a..6f29cce 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -70,13 +70,7 @@
include $(CLEAR_VARS)
-ifeq ($(TARGET_ARCH), arm)
- LOCAL_SDK_VERSION := 8
-else
-# NDK support of other archs (ie. x86 and mips) are only available after android-9
- LOCAL_SDK_VERSION := 9
-endif
-
+LOCAL_SDK_VERSION := 9
LOCAL_NDK_STL_VARIANT := stlport_static
LOCAL_CPP_EXTENSION := .cc
@@ -92,13 +86,7 @@
include $(CLEAR_VARS)
-ifeq ($(TARGET_ARCH), arm)
- LOCAL_SDK_VERSION := 8
-else
-# NDK support of other archs (ie. x86 and mips) are only available after android-9
- LOCAL_SDK_VERSION := 9
-endif
-
+LOCAL_SDK_VERSION := 9
LOCAL_NDK_STL_VARIANT := stlport_static
LOCAL_CPP_EXTENSION := .cc