diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2016-07-01 11:02:04 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2016-07-01 11:02:04 -0700 |
| commit | e102db1f050fbf4d1adfa4cf0eeea69ac223af63 (patch) | |
| tree | eb67e17c604af30ef258f656a92bc9ee3e23eeb6 /src/Makefile.am | |
| parent | aeff638a4cbc2da0b19b61a1cebd40145f892b2d (diff) | |
| download | protobuf-e102db1f050fbf4d1adfa4cf0eeea69ac223af63.tar.gz protobuf-e102db1f050fbf4d1adfa4cf0eeea69ac223af63.tar.bz2 protobuf-e102db1f050fbf4d1adfa4cf0eeea69ac223af63.zip | |
Fix some failing travis tests.
1. Add missing header file to Makefile.am.
2. Re-generate objectivec generated code for well-known types.
Change-Id: If28217c701cf8bd739ea0db240e9eee600f23ee7
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 80065506..b75b6f74 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -375,6 +375,7 @@ libprotoc_la_SOURCES = \ google/protobuf/compiler/java/java_message_builder_lite.h \ google/protobuf/compiler/java/java_name_resolver.cc \ google/protobuf/compiler/java/java_name_resolver.h \ + google/protobuf/compiler/java/java_options.h \ google/protobuf/compiler/java/java_primitive_field.cc \ google/protobuf/compiler/java/java_primitive_field.h \ google/protobuf/compiler/java/java_primitive_field_lite.cc \ |