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 | 50acfdac08049d4895cd204957291017a49627a4 (patch) | |
| tree | cb522ed99d13e5c65b32ccb0163f984d6acfbbd5 /Android.mk | |
| parent | ad5805216d946d262985aa947c3960801a67917f (diff) | |
| parent | 499f47ffdbc383d134d901419ae2e95e25b254c2 (diff) | |
| download | protobuf-50acfdac08049d4895cd204957291017a49627a4.tar.gz protobuf-50acfdac08049d4895cd204957291017a49627a4.tar.bz2 protobuf-50acfdac08049d4895cd204957291017a49627a4.zip | |
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 \ |