diff options
author | Max Cai <maxtroy@google.com> | 2014-01-14 18:08:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-14 18:08:45 +0000 |
commit | a793c09b6fd88fa7910beeadc6d26f8106c43c3f (patch) | |
tree | 9bbf763223a398a43e6d5dc7d6d6775499d9c78f /java | |
parent | 0eecf0b83f65a3d2741449fd1ebdd4154e879573 (diff) | |
parent | bc8eec3d2b5c87cf95a515593700ba56c010920c (diff) | |
download | protobuf-a793c09b6fd88fa7910beeadc6d26f8106c43c3f.tar.gz protobuf-a793c09b6fd88fa7910beeadc6d26f8106c43c3f.tar.bz2 protobuf-a793c09b6fd88fa7910beeadc6d26f8106c43c3f.zip |
Merge "Allow whitespace in nano codegen options."
Diffstat (limited to 'java')
-rw-r--r-- | java/README.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/java/README.txt b/java/README.txt index ced78d23..0646c232 100644 --- a/java/README.txt +++ b/java/README.txt @@ -580,9 +580,9 @@ To use nano protobufs within the Android repo: LOCAL_STATIC_JAVA_LIBRARIES variable, so you don't need to. - Set 'LOCAL_PROTO_JAVA_OUTPUT_PARAMS := ...' in your local .mk file for any command-line options you need. Use commas to join multiple - options. Write all options on the same line; avoid backslash-newline - or '+=', because they will introduce spaces in the middle of your - options and the generator is not prepared to handle them. + options. In the nano flavor only, whitespace surrounding the option + names and values are ignored, so you can use backslash-newline or + '+=' to structure your make files nicely. - The options will be applied to *all* proto files in LOCAL_SRC_FILES when you build a Java library or package. In case different options are needed for different proto files, build separate Java libraries @@ -603,10 +603,9 @@ To use nano protobufs outside of Android repo: - Invoke with --javanano_out, e.g.: ./protoc '--javanano_out=\ -java_package=src/proto/simple-data.proto|my_package,\ -java_outer_classname=src/proto/simple-data.proto|OuterName:\ -.' src/proto/simple-data.proto - + java_package=src/proto/simple-data.proto|my_package,\ + java_outer_classname=src/proto/simple-data.proto|OuterName\ + :.' src/proto/simple-data.proto Contributing to nano: |