Switch compiler to gcc 4.9 as Clang + NDK 12-beta is causing problems.

Stewart Miles · Stewart Miles · commit cbf3f90914b4 · 2016-05-18T11:55:38.000-07:00
diff --git a/admob/testapp/jni/Application.mk b/admob/testapp/jni/Application.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 APP_PLATFORM:=android-14
-NDK_TOOLCHAIN_VERSION=clang
+NDK_TOOLCHAIN_VERSION=4.9
 APP_ABI:=armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64
 APP_STL:=c++_static
 APP_MODULES:=android_main
diff --git a/analytics/testapp/jni/Application.mk b/analytics/testapp/jni/Application.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 APP_PLATFORM:=android-14
-NDK_TOOLCHAIN_VERSION=clang
+NDK_TOOLCHAIN_VERSION=4.9
 APP_ABI:=armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64
 APP_STL:=c++_static
 APP_MODULES:=android_main
diff --git a/auth/testapp/jni/Application.mk b/auth/testapp/jni/Application.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 APP_PLATFORM:=android-14
-NDK_TOOLCHAIN_VERSION=clang
+NDK_TOOLCHAIN_VERSION=4.9
 APP_ABI:=armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64
 APP_STL:=c++_static
 APP_MODULES:=android_main
diff --git a/invites/testapp/jni/Application.mk b/invites/testapp/jni/Application.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 APP_PLATFORM:=android-14
-NDK_TOOLCHAIN_VERSION=clang
+NDK_TOOLCHAIN_VERSION=4.9
 APP_ABI:=armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64
 APP_STL:=c++_static
 APP_MODULES:=android_main
diff --git a/messaging/testapp/jni/Application.mk b/messaging/testapp/jni/Application.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 APP_PLATFORM:=android-14
-NDK_TOOLCHAIN_VERSION=clang
+NDK_TOOLCHAIN_VERSION=4.9
 APP_ABI:=armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64
 APP_STL:=c++_static
 APP_MODULES:=android_main
diff --git a/messaging/testapp/jni/Application.mk-e b/messaging/testapp/jni/Application.mk-e
@@ -0,0 +1,20 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+APP_PLATFORM:=android-14
+NDK_TOOLCHAIN_VERSION=4.9
+APP_ABI:=armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64
+APP_STL:=c++_static
+APP_MODULES:=android_main
+APP_CPPFLAGS+=-std=c++11
diff --git a/remote_config/testapp/jni/Application.mk b/remote_config/testapp/jni/Application.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 APP_PLATFORM:=android-14
-NDK_TOOLCHAIN_VERSION=clang
+NDK_TOOLCHAIN_VERSION=4.9
 APP_ABI:=armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64
 APP_STL:=c++_static
 APP_MODULES:=android_main
