diff options
| author | Jisi Liu <liujisi@google.com> | 2015-04-29 10:44:35 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2015-04-29 10:44:35 -0700 |
| commit | 0e122ce8c591e748e9cda83f1ccf115359a1b0d7 (patch) | |
| tree | 26ced9365c1b9aef3203380f5c0ae92170e364f4 /javanano/pom.xml | |
| parent | 5a9863b5841cff1581a367d75d549831f1252b5a (diff) | |
| parent | 9d546c85bda48c59ba10e240afbf731bd0775bc4 (diff) | |
| download | protobuf-0e122ce8c591e748e9cda83f1ccf115359a1b0d7.tar.gz protobuf-0e122ce8c591e748e9cda83f1ccf115359a1b0d7.tar.bz2 protobuf-0e122ce8c591e748e9cda83f1ccf115359a1b0d7.zip | |
Merge pull request #315 from brianduff/sync_from_aosp
Sync nanoproto from AOSP
Diffstat (limited to 'javanano/pom.xml')
| -rw-r--r-- | javanano/pom.xml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/javanano/pom.xml b/javanano/pom.xml index 7a2be9df..3d8cfb9f 100644 --- a/javanano/pom.xml +++ b/javanano/pom.xml @@ -97,19 +97,19 @@ <arg value="src/test/java/com/google/protobuf/nano/map_test.proto" /> </exec> <exec executable="../src/protoc"> - <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true:target/generated-test-sources" /> + <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true,generate_clone=true:target/generated-test-sources" /> <arg value="--proto_path=src/test/java/com" /> <arg value="src/test/java/com/google/protobuf/nano/unittest_extension_nano.proto" /> <arg value="src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto" /> <arg value="src/test/java/com/google/protobuf/nano/unittest_extension_repeated_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_clone=true:target/generated-test-sources" /> <arg value="--proto_path=src/test/java/com" /> <arg value="src/test/java/com/google/protobuf/nano/unittest_extension_packed_nano.proto" /> </exec> <exec executable="../src/protoc"> - <arg value="--javanano_out=java_nano_generate_has=true,generate_equals=true:target/generated-test-sources" /> + <arg value="--javanano_out=java_nano_generate_has=true,generate_equals=true,generate_clone=true:target/generated-test-sources" /> <arg value="--proto_path=src/test/java/com" /> <arg value="src/test/java/com/google/protobuf/nano/unittest_has_nano.proto" /> </exec> @@ -139,6 +139,15 @@ <arg value="--proto_path=src/test/java/com" /> <arg value="src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto" /> </exec> + <exec executable="../src/protoc"> + <arg value="--javanano_out= + optional_field_style=reftypes_compat_mode, + generate_equals=true, + java_outer_classname=google/protobuf/nano/unittest_reference_types_nano.proto|NanoReferenceTypesCompat + :target/generated-test-sources" /> + <arg value="--proto_path=src/test/java/com" /> + <arg value="src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto" /> + </exec> </tasks> <testSourceRoot>target/generated-test-sources</testSourceRoot> </configuration> |