diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-01-29 13:51:05 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-01-29 13:51:05 -0800 |
| commit | 5221dcbe479ed765d8103ed7601c69b6d8d6ca4f (patch) | |
| tree | d48fed101cf2fc21e07d3034cc4e01c81f00bac2 /src/Makefile.am | |
| parent | cb3f428810456dbb31211ed421401b90fb3b6586 (diff) | |
| download | protobuf-5221dcbe479ed765d8103ed7601c69b6d8d6ca4f.tar.gz protobuf-5221dcbe479ed765d8103ed7601c69b6d8d6ca4f.tar.bz2 protobuf-5221dcbe479ed765d8103ed7601c69b6d8d6ca4f.zip | |
Integrate from google internal.
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 462eb3e1..073673a5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -342,6 +342,8 @@ libprotoc_la_SOURCES = \ google/protobuf/compiler/java/java_enum_lite.h \ google/protobuf/compiler/java/java_extension.cc \ google/protobuf/compiler/java/java_extension.h \ + google/protobuf/compiler/java/java_extension_lite.cc \ + google/protobuf/compiler/java/java_extension_lite.h \ google/protobuf/compiler/java/java_field.cc \ google/protobuf/compiler/java/java_field.h \ google/protobuf/compiler/java/java_file.cc \ @@ -727,6 +729,7 @@ protobuf_test_SOURCES = \ google/protobuf/compiler/cpp/cpp_unittest.h \ google/protobuf/compiler/cpp/cpp_unittest.cc \ google/protobuf/compiler/cpp/cpp_plugin_unittest.cc \ + google/protobuf/compiler/cpp/metadata_test.cc \ google/protobuf/compiler/java/java_plugin_unittest.cc \ google/protobuf/compiler/java/java_doc_comment_unittest.cc \ google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc \ |