diff options
| author | Ying Wang <wangying@google.com> | 2013-09-19 16:49:38 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-09-19 16:49:38 -0700 |
| commit | 6347a8c4df1942a8a3736fd54f413d8c3df2e9c0 (patch) | |
| tree | 9595255531ce78cf3666f7db345b99962f1f467a | |
| parent | 446452f84e9cc4c75d8e80f6f05e24793397a19d (diff) | |
| download | webrtc-6347a8c4df1942a8a3736fd54f413d8c3df2e9c0.tar.gz | |
Remvoe unnecessary dependencies.
So it can build against the NDK.
Change-Id: I988bb0246be96ca628b19792b8e1d33e43b8c219
4 files changed, 0 insertions, 22 deletions
diff --git a/src/common_audio/signal_processing/Android.mk b/src/common_audio/signal_processing/Android.mk index 142a66e6c1..bef71876ff 100644 --- a/src/common_audio/signal_processing/Android.mk +++ b/src/common_audio/signal_processing/Android.mk @@ -72,14 +72,6 @@ LOCAL_SRC_FILES += \ spl_sqrt_floor.c endif -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) -LOCAL_LDLIBS += -ldl -lpthread -endif - -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif - ifndef NDK_ROOT ifndef WEBRTC_STL LOCAL_SHARED_LIBRARIES += libstlport 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 2794a9ca21..b434ce51d8 100644 --- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk +++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk @@ -65,12 +65,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../../../.. \ $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include -LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libdl - ifndef NDK_ROOT ifndef WEBRTC_STL LOCAL_SHARED_LIBRARIES += libstlport 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..75c7e16d93 100644 --- a/src/modules/audio_coding/codecs/isac/main/source/Android.mk +++ b/src/modules/audio_coding/codecs/isac/main/source/Android.mk @@ -55,10 +55,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../../../.. \ $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libdl - ifndef NDK_ROOT ifndef WEBRTC_STL LOCAL_SHARED_LIBRARIES += libstlport diff --git a/src/system_wrappers/source/Android.mk b/src/system_wrappers/source/Android.mk index 923a2fb633..6cbf9fb7db 100644 --- a/src/system_wrappers/source/Android.mk +++ b/src/system_wrappers/source/Android.mk @@ -51,10 +51,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/spreadsortlib -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libdl - ifndef NDK_ROOT ifndef WEBRTC_STL LOCAL_SHARED_LIBRARIES += libstlport |