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

Commit 4bf9b396 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 29f8d7d6: Merge "Make gnu++11 the default standard version." 

* commit '29f8d7d6':
  Make gnu++11 the default standard version.
parents 4c89843c 29f8d7d6

CleanSpec.mk

+5 −0
Original line number Diff line number Diff line
@@ -315,6 +315,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

# ************************************************

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -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