commit da637397679a03fef665ccefa4c1b7f6c2473fb3
author Dan Albert <danalbert@google.com> Mon Oct 26 11:09:24 2015 -0700
committer Dan Albert <danalbert@google.com> Mon Oct 26 11:28:33 2015 -0700
tree 4272aeb244045d00bd50844c827115e58277dc12
parent 14c2d968b913573e7a21fe72723254c9cc277210

Drop GCC back to C++11.

Our GCC does not use a valid C++14 ABI.

Bug: http://b/25022512
Change-Id: I6f4b3450137c24a6a0c00bf956bae7a0ba280094

core/binary.mk

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 :=