Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dba46710 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Drop GCC back to C++11."

parents 14c2d968 da637397
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -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 :=