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

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

Issue 6109003: Fix grit dependencies for chromeos, touchui, and toolkit_views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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') | no next file » | 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 },{
11 'webkit_src_dir': '../../third_party/WebKit', 11 'webkit_src_dir': '../../third_party/WebKit',
12 }], 12 }],
13 ], 13 ],
14 14
15 'grit_info_cmd': ['python', '<(DEPTH)/tools/grit/grit_info.py'], 15 'grit_info_cmd': ['python', '<(DEPTH)/tools/grit/grit_info.py',
16 '<@(grit_defines)'],
16 'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'], 17 'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
17 }, 18 },
18 'targets': [ 19 'targets': [
19 { 20 {
20 'target_name': 'webkit_resources', 21 'target_name': 'webkit_resources',
21 'type': 'none', 22 'type': 'none',
22 'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9', 23 'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9',
23 'variables': { 24 'variables': {
24 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', 25 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
25 }, 26 },
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 }], 525 }],
525 ['inside_chromium_build==0', { 526 ['inside_chromium_build==0', {
526 'dependencies': [ 527 'dependencies': [
527 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 528 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
528 ], 529 ],
529 }], 530 }],
530 ], 531 ],
531 }, 532 },
532 ], 533 ],
533 } 534 }
OLDNEW
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698