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

Merge "Disallow using stlport." into mnc-dev

This commit is contained in:
Dan Albert 2015-05-12 23:11:10 +00:00 committed by Android (Google) Code Review
parent 04cfb9e113 0a4122a4f2
commit 93f22ee7e2
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/cxx_stl_setup.mk
View File

@ -76,18 +76,8 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_shared_libraries += libdl my_shared_libraries += libdl
endif endif
endif endif
else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),)
ifndef LOCAL_IS_HOST_MODULE
my_c_includes += external/stlport/stlport bionic/libstdc++/include \
bionic
ifeq ($(my_cxx_stl),stlport)
my_shared_libraries += libstdc++ libstlport
else
my_static_libraries += libstdc++ libstlport_static
endif
endif
else ifeq ($(my_cxx_stl),ndk) else ifeq ($(my_cxx_stl),ndk)
# Using an NDK STL. Handled farther up in this file. # Using an NDK STL. Handled in binary.mk.
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE
my_system_shared_libraries += libstdc++ my_system_shared_libraries += libstdc++
endif endif
@ -106,5 +96,5 @@ else ifeq ($(my_cxx_stl),none)
my_ldlibs += $($(my_prefix)$(HOST_OS)_$(my_link_type)_gcclibs) my_ldlibs += $($(my_prefix)$(HOST_OS)_$(my_link_type)_gcclibs)
endif endif
else else
$(error $(my_cxx_stl) is not a supported STL.) $(error $(LOCAL_PATH): $(LOCAL_MODULE): $(my_cxx_stl) is not a supported STL.)
endif endif