commit dd2ca84dea049a36814722c797e6a8cbc40ad955
author Dan Albert <danalbert@google.com> Tue Sep 08 10:59:00 2015 -0700
committer Dan Albert <danalbert@google.com> Tue Sep 08 11:00:42 2015 -0700
tree eca9e699796581f6c942d041d1b6a2153a6a2201
parent 887f488ea10b7ab0130203d66d5b1b3586264d73

Fix name for NDK protobuf libraries.

NDK protobuf libs are being renamed with -ndk for clarity.

Change-Id: Ida2d6e99adea2cf25453d3b5d2bbd124f45d65c3

Android.mk

diff --git a/Android.mk b/Android.mk
index d79d19d..9ac8947 100644
--- a/Android.mk
+++ b/Android.mk
@@ -60,9 +60,8 @@
     libwebrtc_isacfix_neon
 endif
 
-LOCAL_STATIC_LIBRARIES := \
-    libprotobuf-cpp-lite
 LOCAL_SHARED_LIBRARIES := \
+    libprotobuf-cpp-lite \
     libcutils \
     libdl \
 

src/modules/audio_processing/Android.mk

diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk
index 6b886d5..3883671 100644
--- a/src/modules/audio_processing/Android.mk
+++ b/src/modules/audio_processing/Android.mk
@@ -111,7 +111,7 @@
 LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite
 else
 LOCAL_STATIC_LIBRARIES := \
-    libprotobuf-cpp-lite
+    libprotobuf-cpp-lite-ndk
 LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL)
 LOCAL_SDK_VERSION := 14
 LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL)