diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-25 19:58:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 19:58:41 +0000 |
| commit | 4bf9b396bd237873fa1ab7f87f9da421c34cd7c2 (patch) | |
| tree | 3f11cb810ea8b426d313b5f6fbf781f260eeaa12 | |
| parent | 4c89843c1055d90c99be7692ebde9979e8678ed8 (diff) | |
| parent | 29f8d7d68a8dadd9cb2f087caa1f02a5240e8a07 (diff) | |
| download | build-4bf9b396bd237873fa1ab7f87f9da421c34cd7c2.zip build-4bf9b396bd237873fa1ab7f87f9da421c34cd7c2.tar.gz build-4bf9b396bd237873fa1ab7f87f9da421c34cd7c2.tar.bz2 | |
am 29f8d7d6: Merge "Make gnu++11 the default standard version."
* commit '29f8d7d68a8dadd9cb2f087caa1f02a5240e8a07':
Make gnu++11 the default standard version.
| -rw-r--r-- | CleanSpec.mk | 5 | ||||
| -rw-r--r-- | core/config.mk | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 56a1cad..d5206bb 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ 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 |