Index: build/protoc_java.gypi |
diff --git a/build/protoc_java.gypi b/build/protoc_java.gypi |
index 853760c7a30cbac1b8f8149ade161a28495a899b..e1525b00d7e69a3e8d645db37c9ab4ca085243df 100644 |
--- a/build/protoc_java.gypi |
+++ b/build/protoc_java.gypi |
@@ -23,9 +23,6 @@ |
# The 'proto_in_dir' variable must be the relative path to the |
# directory containing the .proto files. If left out, it defaults to '.'. |
# |
-# You can optionally set a variable 'proto_runtime' to either 'lite' or 'nano'. |
-# The default runtime is 'lite'. |
-# |
# The 'output_java_files' variable specifies a list of output files that will |
# be generated. It is based on the package and java_outer_classname fields in |
# the proto. All the values must be prefixed with >(java_out_dir), since that |
@@ -41,7 +38,7 @@ |
{ |
'variables': { |
- 'proto_runtime%': 'lite', |
+ 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)android_protoc<(EXECUTABLE_SUFFIX)', |
'java_out_dir': '<(PRODUCT_DIR)/java_proto/<(_target_name)/src', |
'proto_in_dir%': '.', |
'stamp_file': '<(java_out_dir).stamp', |
@@ -71,32 +68,15 @@ |
'<(protoc)', |
'<(proto_in_dir)', |
'<(java_out_dir)', |
- '<(proto_runtime)', |
'<(stamp_file)', |
'<@(_sources)', |
], |
- 'message': 'Generating <(proto_runtime) Java code from protobuf files in <(proto_in_dir)', |
+ 'message': 'Generating Java code from protobuf files in <(proto_in_dir)', |
}, |
], |
- 'conditions': [ |
- ['proto_runtime=="lite"', { |
- 'variables': { |
- 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', |
- }, |
- 'dependencies': [ |
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host', |
- '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite_javalib', |
- ], |
- }], |
- ['proto_runtime=="nano"', { |
- 'variables': { |
- 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)android_protoc<(EXECUTABLE_SUFFIX)', |
- }, |
- 'dependencies': [ |
- '<(DEPTH)/third_party/android_protobuf/android_protobuf.gyp:android_protoc#host', |
- '<(DEPTH)/third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_javalib', |
- ], |
- }], |
+ 'dependencies': [ |
+ '<(DEPTH)/third_party/android_protobuf/android_protobuf.gyp:android_protoc#host', |
+ '<(DEPTH)/third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_javalib', |
], |
'includes': [ 'java.gypi' ], |
} |