diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2013-02-04 17:33:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-04 17:33:41 +0000 |
| commit | fea56d8416b7ec51681edecae82c3b4b8c7b7e15 (patch) | |
| tree | 321546625f50736b08eab68b060a6e57e14399bb /src/common_audio/vad/Android.mk | |
| parent | 62f88b75e4f2cf47433a0a8948d679c0334f2204 (diff) | |
| download | webrtc-fea56d8416b7ec51681edecae82c3b4b8c7b7e15.tar.gz | |
Revert "Add libwebrtc_audio_coding_gnustl_static static library". It tests are broken
This reverts commit 62f88b75e4f2cf47433a0a8948d679c0334f2204
Change-Id: I3a2c531c28d47867eb189d45c04632b54e9acca6
Diffstat (limited to 'src/common_audio/vad/Android.mk')
| -rw-r--r-- | src/common_audio/vad/Android.mk | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/common_audio/vad/Android.mk b/src/common_audio/vad/Android.mk index 6cacbdb940..b7be3f0307 100644 --- a/src/common_audio/vad/Android.mk +++ b/src/common_audio/vad/Android.mk @@ -30,10 +30,11 @@ LOCAL_CFLAGS := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../signal_processing/include + $(LOCAL_PATH)/../signal_processing/include LOCAL_SHARED_LIBRARIES := \ - libdl + libdl \ + libstlport ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) LOCAL_LDLIBS += -ldl -lpthread @@ -44,16 +45,6 @@ LOCAL_SHARED_LIBRARIES += libdl endif 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) |