Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Unified Diff: build/protoc_java.py

Issue 556933002: Remove protobuf lite for java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase before submit Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/protoc_java.gypi ('k') | third_party/cacheinvalidation/cacheinvalidation.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/protoc_java.py
diff --git a/build/protoc_java.py b/build/protoc_java.py
index 3ccbaa77215d197e37efb05481c3ac67bb96d3ba..940fd80acf0f7185d757bd91f5314e5deb2c4c95 100755
--- a/build/protoc_java.py
+++ b/build/protoc_java.py
@@ -6,8 +6,7 @@
"""Generate java source files from protobuf files.
Usage:
- protoc_java.py {protoc} {proto_path} {java_out} {proto_runtime} \
- {stamp_file} {proto_files}
+ protoc_java.py {protoc} {proto_path} {java_out} {stamp_file} {proto_files}
This is a helper file for the genproto_java action in protoc_java.gypi.
@@ -16,8 +15,6 @@ It performs the following steps:
2. Creates source directory.
3. Generates Java files using protoc.
4. Creates a new stamp file.
-
-proto_runtime must be one of 'nano' and 'lite'.
"""
import os
@@ -26,12 +23,12 @@ import subprocess
import sys
def main(argv):
- if len(argv) < 6:
+ if len(argv) < 5:
usage()
return 1
- protoc_path, proto_path, java_out, proto_runtime, stamp_file = argv[1:6]
- proto_files = argv[6:]
+ protoc_path, proto_path, java_out, stamp_file = argv[1:5]
+ proto_files = argv[5:]
# Delete all old sources.
if os.path.exists(java_out):
@@ -40,15 +37,10 @@ def main(argv):
# Create source directory.
os.makedirs(java_out)
- # Figure out which runtime to use.
- if proto_runtime == 'nano':
- out_arg = '--javanano_out=optional_field_style=reftypes,' + \
- 'store_unknown_fields=true:' + java_out
- elif proto_runtime == 'lite':
- out_arg = '--java_out=' + java_out
- else:
- usage()
- return 1
+ # Specify arguments to the generator.
+ generator_args = ['optional_field_style=reftypes',
+ 'store_unknown_fields=true']
+ out_arg = '--javanano_out=' + ','.join(generator_args) + ':' + java_out
# Generate Java files using protoc.
ret = subprocess.call(
« no previous file with comments | « build/protoc_java.gypi ('k') | third_party/cacheinvalidation/cacheinvalidation.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698