openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 4f20869b: Merge "Bump the default C++ standard up to C++14." 

* commit '4f20869b1faa07ee0f615ee9087b91ef11e2d6e4':
  Bump the default C++ standard up to C++14.
This commit is contained in:
Dan Albert 2015-08-10 20:48:48 +00:00 committed by Android Git Automerger
parent 0fed67301d 4f20869b1f
commit 96f480c93a
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/binary.mk
View File

@ -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),)

2
core/config.mk
View File

@ -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 := \