From da637397679a03fef665ccefa4c1b7f6c2473fb3 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Mon, 26 Oct 2015 11:09:24 -0700
Subject: [PATCH] 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 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/binary.mk b/core/binary.mk
index 28aa882dc2..e9b22656fc 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -203,6 +203,14 @@ else ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
 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 :=