diff --git a/core/binary.mk b/core/binary.mk index 79548bac40..c716b179d9 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -179,6 +179,22 @@ ifdef LOCAL_IS_HOST_MODULE endif endif +my_cpp_std_version := -std=gnu++14 +ifdef LOCAL_SDK_VERSION + # The NDK handles this itself. + my_cpp_std_version := +endif + +ifdef LOCAL_IS_HOST_MODULE + ifneq ($(my_clang),true) + # The host GCC doesn't support C++14 (and is deprecated, so likely + # never will). Build these modules with C++11. + my_cpp_std_version := -std=gnu++11 + endif +endif + +my_cppflags := $(my_cpp_std_version) $(my_cppflags) + # Add option to make clang the default for device build ifeq ($(USE_CLANG_PLATFORM_BUILD),true) ifeq ($(my_clang),) diff --git a/core/config.mk b/core/config.mk index 78ef255258..c8d4c3e848 100644 --- a/core/config.mk +++ b/core/config.mk @@ -114,7 +114,7 @@ hide := $(if $(SHOW_COMMANDS),,@) COMMON_GLOBAL_CFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused -Winit-self -Wpointer-arith COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG -COMMON_GLOBAL_CPPFLAGS:= $(COMMON_GLOBAL_CFLAGS) -Wsign-promo -std=gnu++11 +COMMON_GLOBAL_CPPFLAGS:= $(COMMON_GLOBAL_CFLAGS) -Wsign-promo COMMON_RELEASE_CPPFLAGS:= $(COMMON_RELEASE_CFLAGS) GLOBAL_CFLAGS_NO_OVERRIDE := \