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

Merge "Remove support for gnustl." am: 51fb7ac7b3 am: b5a2a2396a 

am: ae86c094e8

Change-Id: Ic2b527512158a928c0400a4234cbbe6deea94e56
This commit is contained in:
Dan Albert 2018-01-05 23:45:01 +00:00 committed by android-build-merger
parent 3048193d40 ae86c094e8
commit 7e6fbb070f
3 changed files with 1 additions and 13 deletions

4
core/allowed_ndk_types.mk
View File

@ -28,9 +28,6 @@ ifdef LOCAL_SDK_VERSION
else ifeq ($(LOCAL_NDK_STL_VARIANT),c++_static)
my_ndk_stl_family := libc++
my_ndk_stl_link_type := static
else ifeq ($(LOCAL_NDK_STL_VARIANT),gnustl_static)
my_ndk_stl_family := gnustl
my_ndk_stl_link_type := static
else ifeq ($(LOCAL_NDK_STL_VARIANT),stlport_shared)
my_ndk_stl_family := stlport
my_ndk_stl_link_type := shared
@ -69,7 +66,6 @@ ifdef LOCAL_SDK_VERSION
# already been checked for consistency, and if they don't they'll be
# kept isolated by RTLD_LOCAL anyway.
my_allowed_ndk_types += \
native:ndk:gnustl:static \
native:ndk:libc++:shared native:ndk:libc++:static \
native:ndk:stlport:shared native:ndk:stlport:static \

8
core/binary.mk
View File

@ -189,7 +189,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
ifeq (,$(LOCAL_NDK_STL_VARIANT))
LOCAL_NDK_STL_VARIANT := system
endif
ifneq (1,$(words $(filter none system stlport_static stlport_shared c++_static c++_shared gnustl_static, $(LOCAL_NDK_STL_VARIANT))))
ifneq (1,$(words $(filter none system stlport_static stlport_shared c++_static c++_shared, $(LOCAL_NDK_STL_VARIANT))))
$(error $(LOCAL_PATH): Unknown LOCAL_NDK_STL_VARIANT $(LOCAL_NDK_STL_VARIANT))
endif
ifeq (system,$(LOCAL_NDK_STL_VARIANT))
@ -232,17 +232,11 @@ ifneq ($(LOCAL_SDK_VERSION),)
my_ldlibs += -ldl
my_ndk_cpp_std_version := c++11
else # LOCAL_NDK_STL_VARIANT is not c++_* either
ifneq (,$(filter gnustl_%, $(LOCAL_NDK_STL_VARIANT)))
my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_GCC_VERSION)/libs/$(my_cpu_variant)/include \
$(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_GCC_VERSION)/include
my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_GCC_VERSION)/libs/$(my_cpu_variant)/libgnustl_static.a
else # LOCAL_NDK_STL_VARIANT must be none
# Do nothing.
endif
endif
endif
endif
endif
ifneq ($(LOCAL_USE_VNDK),)

2
core/target_test_internal.mk
View File

@ -12,8 +12,6 @@ ifeq ($(LOCAL_GTEST),true)
my_ndk_gtest_suffix := _c++
else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),)
my_ndk_gtest_suffix := _stlport
else ifneq ($(filter gnustl_,$(LOCAL_NDK_STL_VARIANT)),)
my_ndk_gtest_suffix := _gnustl
else # system STL, use stlport
my_ndk_gtest_suffix := _stlport
endif