aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-04-08 09:50:08 -0700
committerYing Wang <wangying@google.com>2015-08-18 14:33:26 -0700
commitb134d57838be4f630ce516c1eafa4d0f85a5af26 (patch)
treefd47c7d005ee9433f19b29a1238b27997d23e413
parentabab95c5b8e05cdba17242ee147858f322cd77f0 (diff)
downloadnanopb-c-b134d57838be4f630ce516c1eafa4d0f85a5af26.tar.gz
Rename libnanopb-c to follow other protobuf libraries.
- Remove version code from the library name. The version code used to cause big trouble when we upgraded external/protobuf to a new version. - Rename them to follow libprotobuf-<lang>-<type> pattern in external/protobuf. Bug: 20093047 Change-Id: I4f20a1df239d997fee52175b2c719194b0168eef
-rw-r--r--Android.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 2cb2b90..dd7436a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@ nanopb_c_src_files := \
include $(CLEAR_VARS)
-LOCAL_MODULE := libnanopb-c-2.8.0
+LOCAL_MODULE := libprotobuf-c-nano
LOCAL_MODULE_TAGS := optional
LOCAL_C_EXTENSION := .c
LOCAL_SRC_FILES := $(nanopb_c_src_files)
@@ -43,7 +43,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_MODULE := libnanopb-c-2.8.0-enable_malloc
+LOCAL_MODULE := libprotobuf-c-nano-enable_malloc
LOCAL_MODULE_TAGS := optional
LOCAL_C_EXTENSION := .c
LOCAL_SRC_FILES := $(nanopb_c_src_files)
@@ -60,4 +60,3 @@ include $(BUILD_STATIC_LIBRARY)
# Clean temp vars
nanopb_c_src_files :=
-