commit a187fb5986def2b4364d784f7d320f313ae8b408
author Dan Albert <danalbert@google.com> Tue Sep 08 10:47:03 2015 -0700
committer Dan Albert <danalbert@google.com> Tue Sep 08 10:47:03 2015 -0700
tree f0a0d8db2fefd8db9f7dc46074bbeb8a8e11a01f
parent e711afb154333407fe42e8ffe36bf76448d4f80f

Fix name for NDK protobuf libraries.

Name them *-ndk so it's clear which library is which.

Change-Id: I53544a8a97488f902e00d1aedaa021d09ee2f649

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index cb045cc..9161667 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -618,13 +618,13 @@
     my_static_libraries += libprotobuf-c-nano
 else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)
     ifdef LOCAL_SDK_VERSION
-        my_static_libraries += libprotobuf-cpp-full
+        my_static_libraries += libprotobuf-cpp-full-ndk
     else
         my_shared_libraries += libprotobuf-cpp-full
     endif
 else
     ifdef LOCAL_SDK_VERSION
-        my_static_libraries += libprotobuf-cpp-lite
+        my_static_libraries += libprotobuf-cpp-lite-ndk
     else
         my_shared_libraries += libprotobuf-cpp-lite
     endif