Merge "Remove support for stlport." (9eba210e) · Commits · e / os / android_build

core/allowed_ndk_types.mk

+1 −8

Original line number	Diff line number	Diff line
		@@ -28,12 +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),stlport_shared)
		my_ndk_stl_family := stlport
		my_ndk_stl_link_type := shared
		else ifeq ($(LOCAL_NDK_STL_VARIANT),stlport_static)
		my_ndk_stl_family := stlport
		my_ndk_stl_link_type := static
		else ifeq ($(LOCAL_NDK_STL_VARIANT),none)
		my_ndk_stl_family := none
		my_ndk_stl_link_type := none
		@@ -66,8 +60,7 @@ 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:libc++:shared native:ndk:libc++:static \
		native:ndk:stlport:shared native:ndk:stlport:static \
		native:ndk:libc++:shared native:ndk:libc++:static

		# The "none" link type that used by static libraries is intentionally
		# omitted here. We should only be dealing with shared libraries in

core/binary.mk

+3 −15

Original line number	Diff line number	Diff line
		@@ -189,24 +189,14 @@ 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, $(LOCAL_NDK_STL_VARIANT))))
		ifneq (1,$(words $(filter none system 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))
		my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/system/include
		my_system_shared_libraries += libstdc++
		else # LOCAL_NDK_STL_VARIANT is not system
		ifneq (,$(filter stlport_%, $(LOCAL_NDK_STL_VARIANT)))
		my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/stlport/stlport
		my_system_shared_libraries += libstdc++
		ifeq (stlport_static,$(LOCAL_NDK_STL_VARIANT))
		my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/stlport/libs/$(my_cpu_variant)/libstlport_static.a
		my_ldlibs += -ldl
		else
		my_ndk_stl_shared_lib_fullpath := $(my_ndk_source_root)/cxx-stl/stlport/libs/$(my_cpu_variant)/libstlport_shared.so
		endif
		else # LOCAL_NDK_STL_VARIANT is not stlport_* either
		ifneq (,$(filter c++_%, $(LOCAL_NDK_STL_VARIANT)))
		else ifneq (,$(filter c++_%, $(LOCAL_NDK_STL_VARIANT)))
		my_ndk_stl_include_path := \
		$(my_ndk_source_root)/cxx-stl/llvm-libc++/include
		my_ndk_stl_include_path += \
		@@ -236,8 +226,6 @@ ifneq ($(LOCAL_SDK_VERSION),)
		# Do nothing.
		endif
		endif
		endif
		endif

		ifneq ($(LOCAL_USE_VNDK),)
		my_cflags += -D__ANDROID_API__=__ANDROID_API_FUTURE__ -D__ANDROID_VNDK__

core/install_jni_libs_internal.mk

+1 −6

Original line number	Diff line number	Diff line
		@@ -24,16 +24,11 @@ my_embedded_prebuilt_jni_libs :=
		ifdef my_embed_jni
		# App explicitly requires the prebuilt NDK stl shared libraies.
		# The NDK stl shared libraries should never go to the system image.
		ifneq ($(filter $(LOCAL_NDK_STL_VARIANT), stlport_shared c++_shared),)
		ifeq ($(LOCAL_NDK_STL_VARIANT),c++_shared)
		ifndef LOCAL_SDK_VERSION
		$(error LOCAL_SDK_VERSION must be defined with LOCAL_NDK_STL_VARIANT, \
		LOCAL_PACKAGE_NAME=$(LOCAL_PACKAGE_NAME))
		endif
		endif
		ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT))
		my_jni_shared_libraries += \
		$(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources/cxx-stl/stlport/libs/$(TARGET_$(my_2nd_arch_prefix)CPU_ABI)/libstlport_shared.so
		else ifeq (c++_shared,$(LOCAL_NDK_STL_VARIANT))
		my_jni_shared_libraries += \
		$(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources/cxx-stl/llvm-libc++/libs/$(TARGET_$(my_2nd_arch_prefix)CPU_ABI)/libc++_shared.so
		endif

core/target_test_internal.mk

+3 −7

Original line number	Diff line number	Diff line
		@@ -8,13 +8,9 @@ ifeq ($(LOCAL_GTEST),true)
		ifndef LOCAL_SDK_VERSION
		LOCAL_STATIC_LIBRARIES += libgtest_main libgtest
		else
		ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT)))
		# TODO(danalbert): Remove the suffix from the module since we only need the
		# one variant now.
		my_ndk_gtest_suffix := _c++
		else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),)
		my_ndk_gtest_suffix := _stlport
		else # system STL, use stlport
		my_ndk_gtest_suffix := _stlport
		endif
		LOCAL_STATIC_LIBRARIES += \
		libgtest_main_ndk$(my_ndk_gtest_suffix) \
		libgtest_ndk$(my_ndk_gtest_suffix)