diff options
| author | Zeno Albisser <zeno.albisser@theqtcompany.com> | 2014-12-05 15:04:29 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-09 10:49:28 +0100 |
| commit | af6588f8d723931a298c995fa97259bb7f7deb55 (patch) | |
| tree | 060ca707847ba1735f01af2372e0d5e494dc0366 /chromium/build/protoc_java.gypi | |
| parent | 2fff84d821cc7b1c785f6404e0f8091333283e74 (diff) | |
| download | qtwebengine-chromium-af6588f8d723931a298c995fa97259bb7f7deb55.tar.gz | |
BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.
Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/build/protoc_java.gypi')
| -rw-r--r-- | chromium/build/protoc_java.gypi | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chromium/build/protoc_java.gypi b/chromium/build/protoc_java.gypi index a99ec6a5df7..9ed597becfe 100644 --- a/chromium/build/protoc_java.gypi +++ b/chromium/build/protoc_java.gypi @@ -38,7 +38,7 @@ { 'variables': { - 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', + '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', @@ -65,18 +65,18 @@ ], 'action': [ '<(script)', - '<(protoc)', - '<(proto_in_dir)', - '<(java_out_dir)', - '<(stamp_file)', + '--protoc=<(protoc)', + '--proto-path=<(proto_in_dir)', + '--java-out-dir=<(java_out_dir)', + '--stamp=<(stamp_file)', '<@(_sources)', ], - 'message': 'Generating Java code from <(proto_in_dir)', + 'message': 'Generating Java code from protobuf files in <(proto_in_dir)', }, ], 'dependencies': [ - '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host', - '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite_javalib', + '<(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' ], } |