diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-16 17:27:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-16 17:27:18 +0000 |
| commit | 7d252f952a65e5cfee917258f04596e6cfe57398 (patch) | |
| tree | e20c8fe1af0c2cf9fbdeebef1ff59e753b7ea47b | |
| parent | cdcb8331459b28b81b346ac59a44f7d79a72a1fb (diff) | |
| parent | 8728d701f79e2ab296ce08c15af6980285c59b96 (diff) | |
| download | webrtc-7d252f952a65e5cfee917258f04596e6cfe57398.tar.gz | |
Merge "Missed an stlport in webrtc."
| -rw-r--r-- | src/modules/audio_processing/aecm/Android.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/modules/audio_processing/aecm/Android.mk b/src/modules/audio_processing/aecm/Android.mk index 3aa14ebd50..d99bbd95b9 100644 --- a/src/modules/audio_processing/aecm/Android.mk +++ b/src/modules/audio_processing/aecm/Android.mk @@ -84,10 +84,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../../common_audio/signal_processing/include -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else +ifdef WEBRTC_STL LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) |