tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am cc356db5: am 5ee74388: Merge "Disallow using stlport."

Browse source 
* commit 'cc356db5531d8c769e58bf1a98fda8f95fba7eed':
  Disallow using stlport.
This commit is contained in:
Dan Albert 2015-05-07 15:58:13 +00:00 committed by Android Git Automerger
commit 0e2dc0261f
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

@ -72,18 +72,8 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_shared_libraries += libdl
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)
# Using an NDK STL. Handled farther up in this file.
# Using an NDK STL. Handled in binary.mk.
ifndef LOCAL_IS_HOST_MODULE
my_system_shared_libraries += libstdc++
endif
@ -102,5 +92,5 @@ else ifeq ($(my_cxx_stl),none)
my_ldlibs += $($(my_prefix)$(HOST_OS)_$(my_link_type)_gcclibs)
endif
else
$(error $(my_cxx_stl) is not a supported STL.)
$(error $(LOCAL_PATH): $(LOCAL_MODULE): $(my_cxx_stl) is not a supported STL.)
endif