diff options
Diffstat (limited to 'core/cxx_stl_setup.mk')
| -rw-r--r-- | core/cxx_stl_setup.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 5abdf70..02a41e5 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -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. |