diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-16 09:53:51 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-10-16 09:53:51 -0700 |
| commit | b49987e2f8c102d243266bdffbec6cf12c93ea58 (patch) | |
| tree | aacc7c778557de701cc0424a59507c5de46727d8 | |
| parent | c131ec09d9ffb92473c4162c92c0646d6e731b0c (diff) | |
| download | build-b49987e2f8c102d243266bdffbec6cf12c93ea58.zip build-b49987e2f8c102d243266bdffbec6cf12c93ea58.tar.gz build-b49987e2f8c102d243266bdffbec6cf12c93ea58.tar.bz2 | |
Never use stlport on the host.
LOCAL_CXX_STL := stlport should just use the default STL on the host.
Change-Id: Iede1b2d8884e237a10e000e5835addb768c8f78d
| -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. |