commit 42fa19482abbcebcb2ab563084b7ac1969553fe9
author Ying Wang <wangying@android.com> Tue Aug 18 21:35:42 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 18 21:35:42 2015 +0000
tree 3551031e54dfb17941896bf5befa41aed896eb19
parent c3dcb6c06bd2fbe816a918e9c3b099669bbeb5b5
parent f050c2f1c7d5113e3c9d2cfafe6045af37328212

Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index a16427f..01dab2c 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -600,9 +600,9 @@
 my_export_c_include_dirs += $(my_proto_c_includes)
 
 ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nanopb-c-enable_malloc)
-    my_static_libraries += libnanopb-c-2.8.0-enable_malloc
+    my_static_libraries += libprotobuf-c-nano-enable_malloc
 else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nanopb-c)
-    my_static_libraries += libnanopb-c-2.8.0
+    my_static_libraries += libprotobuf-c-nano
 else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)
     ifdef LOCAL_SDK_VERSION
         my_static_libraries += libprotobuf-cpp-full