zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update protobuf library from 2.3 to 2.6.

Browse Source 
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
This commit is contained in:
Jeff Davidson
2014-09-15 18:12:34 -07:00
parent c19978607b
commit 9a2fe42011
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@ -61,7 +61,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
endif endif
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libprotobuf-cpp-2.3.0-lite libprotobuf-cpp-lite
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libdl \ libdl \
@ -88,7 +88,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
endif endif
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libprotobuf-cpp-2.3.0-lite libprotobuf-cpp-lite
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libdl libdl

4
src/modules/audio_processing/Android.mk
View File

@ -111,7 +111,7 @@ ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite
else else
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libprotobuf-cpp-2.3.0-lite libprotobuf-cpp-lite
LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)
@ -164,7 +164,7 @@ ifndef WEBRTC_STL
LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite
else else
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libprotobuf-cpp-2.3.0-lite libprotobuf-cpp-lite
LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)