Merge "Drop GCC back to C++11."
am: dba46710fe
* commit 'dba46710fe5bb0ea3bea8c3c0fea76273d343ff3':
Drop GCC back to C++11.
diff --git a/core/binary.mk b/core/binary.mk
index 28aa882..e9b2265 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -203,6 +203,14 @@
endif
my_cpp_std_version := -std=gnu++14
+
+ifneq ($(my_clang),true)
+ # GCC uses an invalid C++14 ABI (emits calls to
+ # __cxa_throw_bad_array_length, which is not a valid C++ RT ABI).
+ # http://b/25022512
+ my_cpp_std_version := -std=gnu++11
+endif
+
ifdef LOCAL_SDK_VERSION
# The NDK handles this itself.
my_cpp_std_version :=