am 955ebbaa: Merge "Cleanup libc++ configuration." (015b89cc) · Commits · e / os / android_build

core/cxx_stl_setup.mk

+3 −7

Original line number	Original line	Diff line number	Diff line
	@@ -49,15 +49,11 @@ endif
	ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)		ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
	my_cflags += -D_USING_LIBCXX		my_cflags += -D_USING_LIBCXX
	my_c_includes += external/libcxx/include		my_c_includes += external/libcxx/include
	ifeq ($(my_cxx_stl),libc++)
			ifeq ($(my_link_type),dynamic)
	my_shared_libraries += libc++		my_shared_libraries += libc++
	else		else
	my_static_libraries += libc++_static		my_static_libraries += libc++_static
	ifndef LOCAL_IS_HOST_MODULE
	ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
	my_static_libraries += libm libc libdl
	endif
	endif
	endif		endif

	ifdef LOCAL_IS_HOST_MODULE		ifdef LOCAL_IS_HOST_MODULE
	@@ -71,7 +67,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
	endif		endif

	ifeq ($(my_link_type),static)		ifeq ($(my_link_type),static)
	my_static_libraries += libdl		my_static_libraries += libm libc libdl
	else		else
	my_shared_libraries += libdl		my_shared_libraries += libdl
	endif		endif