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

Never use stlport on the host.

Browse Source 
LOCAL_CXX_STL := stlport should just use the default STL on the host.

Change-Id: Iede1b2d8884e237a10e000e5835addb768c8f78d
This commit is contained in:
Dan Albert
2014-10-16 09:53:51 -07:00
parent c131ec09d9
commit b49987e2f8
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 my_ldlibs += -lc -lm
endif endif
else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),) else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),)
my_c_includes += external/stlport/stlport bionic/libstdc++/include bionic ifndef LOCAL_IS_HOST_MODULE
ifeq ($(my_cxx_stl),stlport) my_c_includes += external/stlport/stlport bionic/libstdc++/include \
my_shared_libraries += libstdc++ libstlport bionic
else ifeq ($(my_cxx_stl),stlport)
my_static_libraries += libstdc++ libstlport_static my_shared_libraries += libstdc++ libstlport
else
my_static_libraries += libstdc++ libstlport_static
endif
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 farther up in this file.