diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-29 18:53:39 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-07-29 18:53:39 -0700 |
| commit | 80d34710621facd1a0560a7513d7e29f883f83b3 (patch) | |
| tree | 0bdd1f21737fbb9d82cee98dca7ba20e3ceba89b | |
| parent | c7253d88b7fa6f7ba115f167a59b1e9f857db728 (diff) | |
| download | stlport-80d34710621facd1a0560a7513d7e29f883f83b3.tar.gz | |
Make it easier to use stlport correctly.
Change-Id: I55da59c8c11057b7d881301ec8c9fd4aa3bd92bf
| -rwxr-xr-x | Android.mk | 13 | ||||
| -rw-r--r-- | libstlport.mk | 9 |
2 files changed, 15 insertions, 7 deletions
@@ -34,6 +34,11 @@ libstlport_src_files := \ src/c_locale.c \ src/cxa.c \ +libstlport_c_includes := \ + external/stlport/stlport \ + bionic \ + bionic/libstdc++/include \ + libstlport_cflags := -D_GNU_SOURCE libstlport_cppflags := -fuse-cxa-atexit @@ -48,11 +53,11 @@ LOCAL_SRC_FILES := $(libstlport_src_files) LOCAL_SRC_FILES += src/sincos.c LOCAL_MODULE := libstlport +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS := $(libstlport_cflags) LOCAL_CPPFLAGS := $(libstlport_cppflags) - -include $(LOCAL_PATH)/libstlport.mk +LOCAL_C_INCLUDES := $(libstlport_c_includes) include $(BUILD_SHARED_LIBRARY) ########################################## @@ -61,9 +66,9 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libstlport_src_files) LOCAL_MODULE := libstlport_static +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS := $(libstlport_cflags) LOCAL_CPPFLAGS := $(libstlport_cppflags) - -include $(LOCAL_PATH)/libstlport.mk +LOCAL_C_INCLUDES := $(libstlport_c_includes) include $(BUILD_STATIC_LIBRARY) diff --git a/libstlport.mk b/libstlport.mk index 571e769..4946217 100644 --- a/libstlport.mk +++ b/libstlport.mk @@ -1,7 +1,10 @@ -# Add a couple include paths to use stlport. +# To use stlport, "include external/stlport/libstlport.mk" in your target. -# Make sure bionic is first so we can include system headers. +# We *prepend* the STL libraries. LOCAL_C_INCLUDES := \ - bionic \ external/stlport/stlport \ + bionic \ + bionic/libstdc++/include \ $(LOCAL_C_INCLUDES) + +LOCAL_SHARED_LIBRARIES += libstlport |