Merge "Make libc++ the default STL." (c52eba1f) · Commits · e / os / android_build

core/cxx_stl_setup.mk

+3 −5

Original line number	Diff line number	Diff line
		@@ -4,16 +4,14 @@
		## Output variables: My_cflags, my_c_includes, my_shared_libraries, etc.
		#############################################################

		# Only around for development purposes. Will be removed soon.
		my_libcxx_is_default := false

		# Select the appropriate C++ STL
		ifeq ($(strip $(LOCAL_CXX_STL)),default)
		ifndef LOCAL_SDK_VERSION
		ifeq ($(strip $(my_libcxx_is_default)),true)
		# Platform code. Select the appropriate STL.
		ifndef USE_MINGW
		my_cxx_stl := libc++
		else
		# libc++ is not supported on mingw.
		my_cxx_stl := libstdc++
		endif
		else

+3 −3

Original line number	Diff line number	Diff line
		@@ -12,10 +12,10 @@ endif
		LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g
		LOCAL_C_INCLUDES += external/gtest/include

		my_test_libcxx := false
		ifeq (,$(TARGET_BUILD_APPS))
		ifneq ($(filter $(strip $(LOCAL_CXX_STL)),libc++ libc++_static),)
		my_test_libcxx := true
		ifeq (,$(TARGET_BUILD_APPS))
		ifneq ($(filter $(strip $(LOCAL_CXX_STL)),bionic stlport stlport_static),)
		my_test_libcxx := false
		endif
		endif

+4 −5

Original line number	Diff line number	Diff line
		@@ -6,13 +6,12 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING

		LOCAL_C_INCLUDES += external/gtest/include

		my_test_libcxx := false
		ifndef LOCAL_SDK_VERSION
		ifeq (,$(TARGET_BUILD_APPS))
		ifneq ($(filter $(strip $(LOCAL_CXX_STL)),libc++ libc++_static),)
		my_test_libcxx := true
		ifdef LOCAL_SDK_VERSION
		my_test_libcxx := false
		endif
		endif
		ifneq ($(filter $(strip $(LOCAL_CXX_STL)),stlport stlport_static),)
		my_test_libcxx := false
		endif

		ifeq ($(my_test_libcxx),true)