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

Side by Side Diff: third_party/protobuf/protobuf.gyp

Issue 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar
Patch Set: Created 7 years, 10 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 unified diff | Download patch
« no previous file with comments | « third_party/jsr-305/jsr-305.gyp ('k') | tools/android/findbugs_plugin/findbugs_plugin.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['use_system_protobuf==0', { 7 ['use_system_protobuf==0', {
8 'conditions': [ 8 'conditions': [
9 ['OS!="win"', { 9 ['OS!="win"', {
10 'variables': { 10 'variables': {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 'dependencies': [ 76 'dependencies': [
77 'protoc#host', 77 'protoc#host',
78 ], 78 ],
79 'variables': { 79 'variables': {
80 'script_descriptors': './protobuf_lite_java_descriptor_proto.py' , 80 'script_descriptors': './protobuf_lite_java_descriptor_proto.py' ,
81 'script_pom': './protobuf_lite_java_parse_pom.py', 81 'script_pom': './protobuf_lite_java_parse_pom.py',
82 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE _SUFFIX)', 82 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE _SUFFIX)',
83 # Variables needed by java.gypi below. 83 # Variables needed by java.gypi below.
84 'java_out_dir': '<(PRODUCT_DIR)/java_proto/protobuf_lite_java_de scriptor_proto', 84 'java_out_dir': '<(PRODUCT_DIR)/java_proto/protobuf_lite_java_de scriptor_proto',
85 'generated_src_dirs': ['<(java_out_dir)'], 85 'generated_src_dirs': ['<(java_out_dir)'],
86 'package_name': '<(_target_name)',
87 'java_in_dir': 'java', 86 'java_in_dir': 'java',
88 'maven_pom': '<(java_in_dir)/pom.xml', 87 'maven_pom': '<(java_in_dir)/pom.xml',
89 'javac_includes': ['<!@(<(script_pom) <(maven_pom))'], 88 'javac_includes': ['<!@(<(script_pom) <(maven_pom))'],
90 'additional_input_paths': [ 89 'additional_input_paths': [
91 '<(java_out_dir)/com/google/protobuf/DescriptorProtos.java' 90 '<(java_out_dir)/com/google/protobuf/DescriptorProtos.java'
92 ], 91 ],
93 }, 92 },
94 'actions': [ 93 'actions': [
95 { 94 {
96 'action_name': 'protobuf_lite_java_gen_descriptor_proto', 95 'action_name': 'protobuf_lite_java_gen_descriptor_proto',
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 'toolsets': ['host', 'target'], 419 'toolsets': ['host', 'target'],
421 }, 420 },
422 { 421 {
423 'target_name': 'py_proto', 422 'target_name': 'py_proto',
424 'type': 'none', 423 'type': 'none',
425 }, 424 },
426 ], 425 ],
427 }], 426 }],
428 ], 427 ],
429 } 428 }
OLDNEW
« no previous file with comments | « third_party/jsr-305/jsr-305.gyp ('k') | tools/android/findbugs_plugin/findbugs_plugin.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698