summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2013-06-25 16:53:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-06-25 16:53:07 +0000
commit0a1429cc5ee4865550bcdddfae681a30cef58a5a (patch)
treed60a02039cea8773f7ba76efd0c7fd6f23768d70 /Android.mk
parent9459b5c45b0ad33bea9376c2afb66cf93da610ac (diff)
parent0e055f079f53b07de3705838a7b4742ce56839f8 (diff)
downloadexternal_protobuf-0a1429cc5ee4865550bcdddfae681a30cef58a5a.zip
external_protobuf-0a1429cc5ee4865550bcdddfae681a30cef58a5a.tar.gz
external_protobuf-0a1429cc5ee4865550bcdddfae681a30cef58a5a.tar.bz2
Merge "Nano support for extensions and unknown fields."
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index dd48922..6a7c6c0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,6 +108,7 @@ COMPILER_SRC_FILES := \
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_extension.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 \