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

Use the platform -std= for LOCAL_SDK_VERSION targets too. 

Bug: http://b/72571399
Test: builds
Change-Id: Ifd06798a7c9af9fd316201d88b724a53bcf0bcd9
This commit is contained in:
Elliott Hughes 2018-02-16 17:12:21 -08:00
parent 7eb2afb226
commit adf7ef8eb9
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/binary.mk
View File

@ -180,7 +180,6 @@ ifneq ($(LOCAL_SDK_VERSION),)
my_ndk_stl_include_path := my_ndk_stl_include_path :=
my_ndk_stl_shared_lib_fullpath := my_ndk_stl_shared_lib_fullpath :=
my_ndk_stl_static_lib := my_ndk_stl_static_lib :=
my_ndk_cpp_std_version :=
my_cpu_variant := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI) my_cpu_variant := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)
ifeq (mips32r6,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH_VARIANT)) ifeq (mips32r6,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH_VARIANT))
my_cpu_variant := mips32r6 my_cpu_variant := mips32r6
@ -220,8 +219,6 @@ ifneq ($(LOCAL_SDK_VERSION),)
endif endif
my_ldlibs += -ldl my_ldlibs += -ldl
my_ndk_cpp_std_version := c++11
else # LOCAL_NDK_STL_VARIANT must be none else # LOCAL_NDK_STL_VARIANT must be none
# Do nothing. # Do nothing.
endif endif
@ -381,11 +378,6 @@ ifneq ($(my_clang),true)
my_cpp_std_version := $(DEFAULT_GCC_CPP_STD_VERSION) my_cpp_std_version := $(DEFAULT_GCC_CPP_STD_VERSION)
endif endif
ifdef LOCAL_SDK_VERSION
# The NDK handles this itself.
my_cpp_std_version := $(my_ndk_cpp_std_version)
endif
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
ifneq ($(my_clang),true) ifneq ($(my_clang),true)
# The host GCC doesn't support C++14 (and is deprecated, so likely # The host GCC doesn't support C++14 (and is deprecated, so likely