diff options
| author |  Jisi Liu <liujisi@google.com> | 2017-10-26 12:20:56 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-26 12:20:56 -0700 |
| commit | 9aaa8e1e55012771acc46703a5c7538bb43060c1 (patch) | |
| tree | 48523046c038db06559a9f15c96c5f0d8b94d4aa /java | |
| parent | 2fc7aea3602eac3c3eb8d82e274851621e7443de (diff) | |
| parent | cdc0d9536a5c68510fde1e4c7d37fff18ecd0d6b (diff) | |
Merge pull request #3804 from pherl/merge
Merge 3.4.x into master before cutting 3.5.x
Diffstat (limited to 'java')
| -rw-r--r-- | java/core/generate-test-sources-build.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/core/generate-test-sources-build.xml b/java/core/generate-test-sources-build.xml index 68951747..abcdf5dd 100644 --- a/java/core/generate-test-sources-build.xml +++ b/java/core/generate-test-sources-build.xml @@ -19,6 +19,7 @@ <arg value="${protobuf.source.dir}/google/protobuf/unittest_enormous_descriptor.proto"/> <arg value="${protobuf.source.dir}/google/protobuf/unittest_no_generic_services.proto"/> <arg value="${protobuf.source.dir}/google/protobuf/unittest_well_known_types.proto"/> + <arg value="${test.proto.dir}/com/google/protobuf/deprecated_file.proto"/> <arg value="${test.proto.dir}/com/google/protobuf/lazy_fields_lite.proto"/> <arg value="${test.proto.dir}/com/google/protobuf/lite_equals_and_hash.proto"/> <arg value="${test.proto.dir}/com/google/protobuf/multiple_files_test.proto"/> |