diff options
| author | Max Cai <maxtroy@google.com> | 2014-08-21 17:38:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-21 17:38:59 +0000 |
| commit | b172d66772c921589a1338f00b34ff5bc3bcc225 (patch) | |
| tree | ea6ca9b98bea95133137b2dcdff4cb3d476b09fe /java/pom.xml | |
| parent | e9d25570a8f67156a77260176b4a7a6f008e156c (diff) | |
| parent | 2e6d4ae02a955d33a75c0642b8ffead20e11fd9a (diff) | |
| download | external_protobuf-b172d66772c921589a1338f00b34ff5bc3bcc225.zip external_protobuf-b172d66772c921589a1338f00b34ff5bc3bcc225.tar.gz external_protobuf-b172d66772c921589a1338f00b34ff5bc3bcc225.tar.bz2 | |
am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."
* commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a':
Keep pointers to extension values.
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/pom.xml b/java/pom.xml index 5b49a72..0a29f31 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -152,19 +152,19 @@ <arg value="../src/google/protobuf/unittest_repeated_merge_nano.proto" /> </exec> <exec executable="../src/protoc"> - <arg value="--javanano_out=store_unknown_fields=true:target/generated-test-sources" /> + <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true:target/generated-test-sources" /> <arg value="--proto_path=../src" /> <arg value="--proto_path=src/test/java" /> <arg value="../src/google/protobuf/unittest_extension_nano.proto" /> </exec> <exec executable="../src/protoc"> - <arg value="--javanano_out=store_unknown_fields=true:target/generated-test-sources" /> + <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true:target/generated-test-sources" /> <arg value="--proto_path=../src" /> <arg value="--proto_path=src/test/java" /> <arg value="../src/google/protobuf/unittest_extension_singular_nano.proto" /> </exec> <exec executable="../src/protoc"> - <arg value="--javanano_out=store_unknown_fields=true:target/generated-test-sources" /> + <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true:target/generated-test-sources" /> <arg value="--proto_path=../src" /> <arg value="--proto_path=src/test/java" /> <arg value="../src/google/protobuf/unittest_extension_repeated_nano.proto" /> |