aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2013-04-01 23:51:38 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-04-01 23:51:39 +0000
commit64a842122cd1bf1863a74d4d2c28d38d4a44c083 (patch)
tree851d3eb1e4c9fa04a475446d3762cb32e03abeab /Android.mk
parentc991c16e92fb3ddb7d072f37665cf1ad25b9c4bc (diff)
parent2337023fd9686b61f73f91588583685abf7d5773 (diff)
downloadprotobuf-64a842122cd1bf1863a74d4d2c28d38d4a44c083.tar.gz
protobuf-64a842122cd1bf1863a74d4d2c28d38d4a44c083.tar.bz2
protobuf-64a842122cd1bf1863a74d4d2c28d38d4a44c083.zip
Merge "Nano protobufs."
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk32
1 files changed, 32 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 889764dd..dd489223 100644
--- a/Android.mk
+++ b/Android.mk
@@ -106,6 +106,15 @@ COMPILER_SRC_FILES := \
src/google/protobuf/compiler/javamicro/javamicro_message.cc \
src/google/protobuf/compiler/javamicro/javamicro_message_field.cc \
src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc \
+ src/google/protobuf/compiler/javanano/javanano_enum.cc \
+ src/google/protobuf/compiler/javanano/javanano_enum_field.cc \
+ src/google/protobuf/compiler/javanano/javanano_field.cc \
+ src/google/protobuf/compiler/javanano/javanano_file.cc \
+ src/google/protobuf/compiler/javanano/javanano_generator.cc \
+ src/google/protobuf/compiler/javanano/javanano_helpers.cc \
+ src/google/protobuf/compiler/javanano/javanano_message.cc \
+ src/google/protobuf/compiler/javanano/javanano_message_field.cc \
+ src/google/protobuf/compiler/javanano/javanano_primitive_field.cc \
src/google/protobuf/compiler/python/python_generator.cc \
src/google/protobuf/io/coded_stream.cc \
src/google/protobuf/io/gzip_stream.cc \
@@ -121,6 +130,29 @@ COMPILER_SRC_FILES := \
src/google/protobuf/stubs/strutil.cc \
src/google/protobuf/stubs/substitute.cc
+# Java nano library (for device-side users)
+# =======================================================
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libprotobuf-java-2.3.0-nano
+LOCAL_MODULE_TAGS := optional
+LOCAL_SDK_VERSION := 8
+
+LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/nano)
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+# Java nano library (for host-side users)
+# =======================================================
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := host-libprotobuf-java-2.3.0-nano
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/nano)
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
# Java micro library (for device-side users)
# =======================================================
include $(CLEAR_VARS)