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

Side by Side Diff: webkit/webkit_resources.gyp

Issue 398243002: Fix the path to blink_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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 | « content/content_tests.gypi ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'targets': [ 6 'targets': [
7 { 7 {
8 # GN version: //webkit:resources 8 # GN version: //webkit:resources
9 'target_name': 'webkit_resources', 9 'target_name': 'webkit_resources',
10 'type': 'none', 10 'type': 'none',
11 'variables': { 11 'variables': {
12 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', 12 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
13 }, 13 },
14 'actions': [ 14 'actions': [
15 { 15 {
16 'action_name': 'webkit_resources', 16 'action_name': 'webkit_resources',
17 'variables': { 17 'variables': {
18 'grit_grd_file': 'glue/resources/webkit_resources.grd', 18 'grit_grd_file': 'glue/resources/webkit_resources.grd',
19 }, 19 },
20 'includes': [ '../build/grit_action.gypi' ], 20 'includes': [ '../build/grit_action.gypi' ],
21 }, 21 },
22 {
23 'action_name': 'blink_chromium_resources',
24 'variables': {
25 'grit_grd_file': '../third_party/WebKit/public/blink_resources.grd',
26 },
27 'includes': [ '../build/grit_action.gypi' ],
28 },
29 ], 22 ],
30 'includes': [ '../build/grit_target.gypi' ], 23 'includes': [ '../build/grit_target.gypi' ],
31 }, 24 },
32 { 25 {
33 # GN version: //webkit:strings 26 # GN version: //webkit:strings
34 'target_name': 'webkit_strings', 27 'target_name': 'webkit_strings',
35 'type': 'none', 28 'type': 'none',
36 'variables': { 29 'variables': {
37 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', 30 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
38 }, 31 },
39 'actions': [ 32 'actions': [
40 { 33 {
41 'action_name': 'webkit_strings', 34 'action_name': 'webkit_strings',
42 'variables': { 35 'variables': {
43 'grit_grd_file': 'glue/webkit_strings.grd', 36 'grit_grd_file': 'glue/webkit_strings.grd',
44 }, 37 },
45 'includes': [ '../build/grit_action.gypi' ], 38 'includes': [ '../build/grit_action.gypi' ],
46 }, 39 },
47 ], 40 ],
48 'includes': [ '../build/grit_target.gypi' ], 41 'includes': [ '../build/grit_target.gypi' ],
49 }, 42 },
50 ] 43 ]
51 } 44 }
52 45
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698