diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-12 02:45:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-12 02:45:23 +0000 |
| commit | cdcb8331459b28b81b346ac59a44f7d79a72a1fb (patch) | |
| tree | ca9f007898b0851eaa54b4458527b5170e4b6eaa | |
| parent | 36f71b9f3e14d333909b826af63400c2a893f424 (diff) | |
| parent | 02ed012922c43c3265fc2ac0b526b4ea95044d7d (diff) | |
| download | webrtc-cdcb8331459b28b81b346ac59a44f7d79a72a1fb.tar.gz | |
Merge "Don't explicitly link gtest."
| -rw-r--r-- | src/modules/audio_processing/Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk index 6ab9b3dd49..a22aef8fd7 100644 --- a/src/modules/audio_processing/Android.mk +++ b/src/modules/audio_processing/Android.mk @@ -95,7 +95,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../../system_wrappers/interface \ - external/gtest/include MY_LIB_SUFFIX := ifdef WEBRTC_STL @@ -112,7 +111,6 @@ ifndef WEBRTC_STL LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite else LOCAL_STATIC_LIBRARIES := \ - libgtest \ libprotobuf-cpp-2.3.0-lite LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 @@ -150,7 +148,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/test \ $(LOCAL_PATH)/../../system_wrappers/interface \ $(LOCAL_PATH)/../../common_audio/signal_processing/include \ - external/gtest/include \ external/protobuf/src MY_LIB_SUFFIX := @@ -167,7 +164,6 @@ ifndef WEBRTC_STL LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite else LOCAL_STATIC_LIBRARIES := \ - libgtest \ libprotobuf-cpp-2.3.0-lite LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 |