Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge from gingerbread

Browse Source 
Change-Id: Id43a6262c3f5cffc37db77748f129acb9c841823
pull/91/head
Jean-Baptiste Queru 14 years ago
parent aa6776432a 6ebe2303fd
commit ee613fac56
1 changed files with 4 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Android.mk

4
Android.mk
Unescape View File

@ -53,6 +53,7 @@ JAVA_LITE_SRC_FILES := \
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-java-2.3.0-micro LOCAL_MODULE := libprotobuf-java-2.3.0-micro
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/micro) LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/micro)
@ -74,6 +75,7 @@ include $(BUILD_HOST_JAVA_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-java-2.3.0-lite LOCAL_MODULE := libprotobuf-java-2.3.0-lite
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(JAVA_LITE_SRC_FILES) LOCAL_SRC_FILES := $(JAVA_LITE_SRC_FILES)
@ -95,6 +97,7 @@ include $(BUILD_HOST_JAVA_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-cpp-2.3.0-lite LOCAL_MODULE := libprotobuf-cpp-2.3.0-lite
LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
@ -135,6 +138,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-cpp-2.3.0-full LOCAL_MODULE := libprotobuf-cpp-2.3.0-full
LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc

Write Preview
Loading…
Cancel
Save