StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8a47f6d3: am f2bdac77: Merge "Never use stlport on the host."

Browse Source 
* commit '8a47f6d3192140646d0d057c371b17e487fc2a77':
  Never use stlport on the host.
This commit is contained in:
Dan Albert
2014-10-16 18:10:15 +00:00
committed by Android Git Automerger
parent 07aade6f47 8a47f6d319
commit ad1891d1e9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/cxx_stl_setup.mk
View File

@@ -38,11 +38,14 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_ldlibs += -lc -lm
endif
else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),)
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
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.