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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 6070011: Refactor grit -D flags into a gyp variable so we don't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: works Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « net/net.gyp ('k') | webkit/tools/test_shell/test_shell.gypi » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../..', 9 'webkit_src_dir': '../../../..',
10 },{ 10 },{
(...skipping 19 matching lines...) Expand all
30 'input_path': './webkit_resources.grd', 30 'input_path': './webkit_resources.grd',
31 }, 31 },
32 'inputs': [ 32 'inputs': [
33 '<!@(<(grit_info_cmd) --inputs <(input_path))', 33 '<!@(<(grit_info_cmd) --inputs <(input_path))',
34 ], 34 ],
35 'outputs': [ 35 'outputs': [
36 '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))', 36 '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
37 ], 37 ],
38 'action': ['<@(grit_cmd)', 38 'action': ['<@(grit_cmd)',
39 '-i', '<(input_path)', 'build', 39 '-i', '<(input_path)', 'build',
40 '-o', '<(grit_out_dir)'], 40 '-o', '<(grit_out_dir)',
41 '<@(grit_defines)'],
41 'message': 'Generating resources from <(input_path)', 42 'message': 'Generating resources from <(input_path)',
42 }, 43 },
43 { 44 {
44 'action_name': 'webkit_chromium_resources', 45 'action_name': 'webkit_chromium_resources',
45 'variables': { 46 'variables': {
46 'input_path': '<(webkit_src_dir)/WebKit/chromium/WebKit.grd', 47 'input_path': '<(webkit_src_dir)/WebKit/chromium/WebKit.grd',
47 }, 48 },
48 'inputs': [ 49 'inputs': [
49 '<!@(<(grit_info_cmd) --inputs <(input_path))', 50 '<!@(<(grit_info_cmd) --inputs <(input_path))',
50 ], 51 ],
51 'outputs': [ 52 'outputs': [
52 '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))', 53 '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
53 ], 54 ],
54 'action': ['<@(grit_cmd)', 55 'action': ['<@(grit_cmd)',
55 '-i', '<(input_path)', 'build', 56 '-i', '<(input_path)', 'build',
56 '-o', '<(grit_out_dir)'], 57 '-o', '<(grit_out_dir)',
58 '<@(grit_defines)'],
57 'message': 'Generating resources from <(input_path)', 59 'message': 'Generating resources from <(input_path)',
58 }, 60 },
59 ], 61 ],
60 'direct_dependent_settings': { 62 'direct_dependent_settings': {
61 'include_dirs': [ 63 'include_dirs': [
62 '<(SHARED_INTERMEDIATE_DIR)/webkit', 64 '<(SHARED_INTERMEDIATE_DIR)/webkit',
63 ], 65 ],
64 }, 66 },
65 'conditions': [ 67 'conditions': [
66 ['OS=="win"', { 68 ['OS=="win"', {
(...skipping 15 matching lines...) Expand all
82 'input_path': './webkit_strings.grd', 84 'input_path': './webkit_strings.grd',
83 }, 85 },
84 'inputs': [ 86 'inputs': [
85 '<!@(<(grit_info_cmd) --inputs <(input_path))', 87 '<!@(<(grit_info_cmd) --inputs <(input_path))',
86 ], 88 ],
87 'outputs': [ 89 'outputs': [
88 '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))', 90 '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
89 ], 91 ],
90 'action': ['<@(grit_cmd)', 92 'action': ['<@(grit_cmd)',
91 '-i', '<(input_path)', 'build', 93 '-i', '<(input_path)', 'build',
92 '-o', '<(grit_out_dir)'], 94 '-o', '<(grit_out_dir)',
95 '<@(grit_defines)'],
93 'message': 'Generating resources from <(input_path)', 96 'message': 'Generating resources from <(input_path)',
94 }, 97 },
95 ], 98 ],
96 'direct_dependent_settings': { 99 'direct_dependent_settings': {
97 'include_dirs': [ 100 'include_dirs': [
98 '<(SHARED_INTERMEDIATE_DIR)/webkit', 101 '<(SHARED_INTERMEDIATE_DIR)/webkit',
99 ], 102 ],
100 }, 103 },
101 'conditions': [ 104 'conditions': [
102 ['OS=="win"', { 105 ['OS=="win"', {
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 }], 522 }],
520 ['inside_chromium_build==0', { 523 ['inside_chromium_build==0', {
521 'dependencies': [ 524 'dependencies': [
522 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 525 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
523 ], 526 ],
524 }], 527 }],
525 ], 528 ],
526 }, 529 },
527 ], 530 ],
528 } 531 }
OLDNEW
« no previous file with comments | « net/net.gyp ('k') | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698