diff options
Diffstat (limited to 'src/system_wrappers/source/Android.mk')
| -rw-r--r-- | src/system_wrappers/source/Android.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/system_wrappers/source/Android.mk b/src/system_wrappers/source/Android.mk index dee84ca294..923a2fb633 100644 --- a/src/system_wrappers/source/Android.mk +++ b/src/system_wrappers/source/Android.mk @@ -41,7 +41,7 @@ LOCAL_SRC_FILES := \ sleep.cc \ thread_posix.cc \ trace_posix.cc \ - rw_lock_posix.cc + rw_lock_posix.cc LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) @@ -53,10 +53,19 @@ LOCAL_C_INCLUDES := \ LOCAL_SHARED_LIBRARIES := \ libcutils \ - libdl \ - libstlport + libdl ifndef NDK_ROOT +ifndef WEBRTC_STL +LOCAL_SHARED_LIBRARIES += libstlport include external/stlport/libstlport.mk +else +LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) +LOCAL_SDK_VERSION := 14 +LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) endif +else +LOCAL_SHARED_LIBRARIES += libstlport +endif + include $(BUILD_STATIC_LIBRARY) |