diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-12 19:46:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-12 19:46:12 +0000 |
| commit | 3ee3b02ec01d7598ae1081274b8f3005fcc1cda3 (patch) | |
| tree | ec33750bd0b8b1fc4e72f437f9d6f586d99863de | |
| parent | b21f7a09b833e739bd753df7ac916c1f2eaaa3e4 (diff) | |
| parent | bcc0d3b89334f32c9cbf4ca0266e6b7f551d7b9a (diff) | |
| download | webrtc-3ee3b02ec01d7598ae1081274b8f3005fcc1cda3.tar.gz | |
am bcc0d3b8: Merge "Update protobuf library from 2.3 to 2.6."
* commit 'bcc0d3b89334f32c9cbf4ca0266e6b7f551d7b9a':
Update protobuf library from 2.3 to 2.6.
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | src/modules/audio_processing/Android.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 8c24396f0c..d79d19da6a 100644 --- a/Android.mk +++ b/Android.mk @@ -61,7 +61,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES_arm += \ endif LOCAL_STATIC_LIBRARIES := \ - libprotobuf-cpp-2.3.0-lite + libprotobuf-cpp-lite LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ @@ -88,7 +88,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES_arm += \ endif LOCAL_STATIC_LIBRARIES := \ - libprotobuf-cpp-2.3.0-lite + libprotobuf-cpp-lite LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk index a22aef8fd7..6b886d5a60 100644 --- a/src/modules/audio_processing/Android.mk +++ b/src/modules/audio_processing/Android.mk @@ -111,7 +111,7 @@ ifndef WEBRTC_STL LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite else LOCAL_STATIC_LIBRARIES := \ - libprotobuf-cpp-2.3.0-lite + libprotobuf-cpp-lite LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) @@ -164,7 +164,7 @@ ifndef WEBRTC_STL LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite else LOCAL_STATIC_LIBRARIES := \ - libprotobuf-cpp-2.3.0-lite + libprotobuf-cpp-lite LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_SDK_VERSION := 14 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) |