diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-10-25 14:43:07 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-10-25 14:43:07 -0700 |
| commit | cdc0d9536a5c68510fde1e4c7d37fff18ecd0d6b (patch) | |
| tree | 1edd0bd0c5876d5fd9ddb52f342835e564792dc2 /java | |
| parent | ee8a0911cbaca2a1849a847bbdc523120d003a31 (diff) | |
| parent | cefa9d73e3ce62b080fda0b306bbeb67a6fc2efa (diff) | |
Merge remote-tracking branch 'origin/3.4.x' into master
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"/> |