Drop GCC back to C++11.

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

Bug: http://b/25022512
Change-Id: I6f4b3450137c24a6a0c00bf956bae7a0ba280094
This commit is contained in:
Dan Albert 2015-10-26 11:09:24 -07:00
parent 14c2d968b9
commit da63739767
1 changed files with 8 additions and 0 deletions

View File

@ -203,6 +203,14 @@ else ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
endif endif
my_cpp_std_version := -std=gnu++14 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 ifdef LOCAL_SDK_VERSION
# The NDK handles this itself. # The NDK handles this itself.
my_cpp_std_version := my_cpp_std_version :=