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

Merge "Add c_std and cpp_std properties." am: 220ca4d04b am: 66496c4b96 am: 492a5ff3eb 

am: 3bb28719cf

Change-Id: Ifbe68f1cca96b8205f52ac30277a0a454f9c8b8b
This commit is contained in:
Dan Albert 2017-02-06 19:29:16 +00:00 committed by android-build-merger
parent 68bdd67174 3bb28719cf
commit 8791fe60d0
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/binary.mk
View File

@ -394,8 +394,21 @@ else ifeq ($(my_clang),)
my_clang := true
endif
my_c_std_version := $(DEFAULT_C_STD_VERSION)
my_cpp_std_version := $(DEFAULT_CPP_STD_VERSION)
ifeq ($(LOCAL_C_STD),)
my_c_std_version := $(DEFAULT_C_STD_VERSION)
else ifeq ($(LOCAL_C_STD),experimental)
my_c_std_version := $(EXPERIMENTAL_C_STD_VERSION)
else
my_c_std_version := $(LOCAL_C_STD)
endif
ifeq ($(LOCAL_CPP_STD),)
my_cpp_std_version := $(DEFAULT_CPP_STD_VERSION)
else ifeq ($(LOCAL_CPP_STD),experimental)
my_cpp_std_version := $(EXPERIMENTAL_CPP_STD_VERSION)
else
my_cpp_std_version := $(LOCAL_CPP_STD)
endif
ifneq ($(my_clang),true)
# GCC uses an invalid C++14 ABI (emits calls to

2
core/clear_vars.mk
View File

@ -226,6 +226,8 @@ LOCAL_VTS_MODE:=
LOCAL_WARNINGS_ENABLE:=
LOCAL_WHOLE_STATIC_LIBRARIES:=
LOCAL_YACCFLAGS:=
LOCAL_C_STD:=
LOCAL_CPP_STD:=
OVERRIDE_BUILT_MODULE_PATH:=
# arch specific variables