diff options
| author | Wink Saville <wink@google.com> | 2013-06-25 09:56:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-25 09:56:06 -0700 |
| commit | d1b8322fccad8946d3b32dda9f75048865a94209 (patch) | |
| tree | c2c8896809378fa269647c94f69174804b1fd206 /Android.mk | |
| parent | 8ac37341ac169e99bc8e45fff614c60fee40e33a (diff) | |
| parent | 0a1429cc5ee4865550bcdddfae681a30cef58a5a (diff) | |
| download | external_protobuf-d1b8322fccad8946d3b32dda9f75048865a94209.zip external_protobuf-d1b8322fccad8946d3b32dda9f75048865a94209.tar.gz external_protobuf-d1b8322fccad8946d3b32dda9f75048865a94209.tar.bz2 | |
am 0a1429cc: Merge "Nano support for extensions and unknown fields."
* commit '0a1429cc5ee4865550bcdddfae681a30cef58a5a':
Nano support for extensions and unknown fields.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 \ |