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

Commit 8791fe60 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Add c_std and cpp_std properties." am: 220ca4d0 am: 66496c4b am: 492a5ff3 

am: 3bb28719

Change-Id: Ifbe68f1cca96b8205f52ac30277a0a454f9c8b8b
parents 68bdd671 3bb28719

core/binary.mk

+15 −2
Original line number Diff line number Diff line
@@ -394,8 +394,21 @@ else ifeq ($(my_clang),) 
    my_clang := true

endif



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

core/clear_vars.mk

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