From bf0426f474bdb7dc4a79bb5e593991094f2caf50 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 8 Sep 2014 19:06:04 -0700 Subject: Make gnu++11 the default standard version. There are a _lot_ of users of `typeof` in the tree, and they'll need a GNU flavored standard. Rather than fixing up all of these individually, let's just use gnu++11 as the default. Bug: 18466763 Change-Id: Ia1bd3adaa74fadba259fda3d37653fb8d5cff69a --- CleanSpec.mk | 5 +++++ core/config.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 3e5d199..52a1b1f 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -310,6 +310,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) +# Make GNU++11 the default standard version. This requires a cleanspec because +# char16_t/char32_t will be real types now instead of typedefs, which means +# an ABI change since the names will mangle differently. +$(call add-clean-step, rm -rf $(OUT_DIR)) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/config.mk b/core/config.mk index aa82e93..c9453ef 100644 --- a/core/config.mk +++ b/core/config.mk @@ -117,7 +117,7 @@ SHOW_COMMANDS:= $(filter showcommands,$(MAKECMDGOALS)) 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 +COMMON_GLOBAL_CPPFLAGS:= $(COMMON_GLOBAL_CFLAGS) -Wsign-promo -std=gnu++11 COMMON_RELEASE_CPPFLAGS:= $(COMMON_RELEASE_CFLAGS) # Set the extensions used for various packages -- cgit v1.1