Merge "Fix using libc++_static in dynamic binaries." (a1e55c5f) · Commits · e / os / android_build

core/cxx_stl_setup.mk

+7 −1

Original line number	Diff line number	Diff line
		@@ -50,11 +50,17 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
		my_cflags += -D_USING_LIBCXX
		my_c_includes += external/libcxx/include

		# Note that the structure of this means that LOCAL_CXX_STL := libc++ will
		# use the static libc++ for static executables.
		ifeq ($(my_link_type),dynamic)
		ifeq ($(my_cxx_stl),libc++)
		my_shared_libraries += libc++
		else
		my_static_libraries += libc++_static
		endif
		else
		my_static_libraries += libc++_static
		endif

		ifdef LOCAL_IS_HOST_MODULE
		my_cppflags += -nostdinc++