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/modules/audio_coding/codecs/isac | |
| 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/modules/audio_coding/codecs/isac')
| -rw-r--r-- | src/modules/audio_coding/codecs/isac/fix/source/Android.mk | 32 | ||||
| -rw-r--r-- | src/modules/audio_coding/codecs/isac/main/source/Android.mk | 15 |
2 files changed, 6 insertions, 41 deletions
diff --git a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk index b47a4a5407..bd95ed8125 100644 --- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk +++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk @@ -69,21 +69,12 @@ LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers LOCAL_SHARED_LIBRARIES := \ libcutils \ - libdl + libdl \ + libstlport 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) ######################### @@ -113,19 +104,10 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../../../.. \ $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include + 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) endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) @@ -164,13 +146,5 @@ LOCAL_MODULE:= webrtc_isac_test ifdef NDK_ROOT include $(BUILD_EXECUTABLE) else -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 include $(BUILD_NATIVE_TEST) endif diff --git a/src/modules/audio_coding/codecs/isac/main/source/Android.mk b/src/modules/audio_coding/codecs/isac/main/source/Android.mk index bacd15192b..07b2a314b5 100644 --- a/src/modules/audio_coding/codecs/isac/main/source/Android.mk +++ b/src/modules/audio_coding/codecs/isac/main/source/Android.mk @@ -53,23 +53,14 @@ LOCAL_CFLAGS := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../../../../../.. \ - $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include + $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include LOCAL_SHARED_LIBRARIES := \ libcutils \ - libdl + libdl \ + libstlport 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) |