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

Side by Side Diff: ios/chrome/ios_chrome_resources.gyp

Issue 862043002: Change grit whitelist to a string parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « build/grit_action.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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_base_dir': '<(SHARED_INTERMEDIATE_DIR)', 8 'grit_base_dir': '<(SHARED_INTERMEDIATE_DIR)',
9 'grit_out_dir': '<(grit_base_dir)/ios/chrome', 9 'grit_out_dir': '<(grit_base_dir)/ios/chrome',
10 'grit_defines': [ 10 # TODO(lliabraa): Remove this whitelist.
11 # TODO(lliabraa): Remove this whitelist. 11 'grit_whitelist': '<(DEPTH)/ios/build/grit_whitelist.txt',
12 '-w', '<(DEPTH)/ios/build/grit_whitelist.txt',
13 ],
14 }, 12 },
15 'targets': [ 13 'targets': [
16 { 14 {
17 'target_name': 'ios_theme_resources_gen', 15 'target_name': 'ios_theme_resources_gen',
18 'type': 'none', 16 'type': 'none',
19 'actions': [ 17 'actions': [
20 { 18 {
21 'action_name': 'ios_theme_resources', 19 'action_name': 'ios_theme_resources',
22 'variables': { 20 'variables': {
23 'grit_grd_file': 'app/theme/ios_theme_resources.grd', 21 'grit_grd_file': 'app/theme/ios_theme_resources.grd',
24 }, 22 },
25 'includes': [ '../../build/grit_action.gypi' ], 23 'includes': [ '../../build/grit_action.gypi' ],
26 }, 24 },
27 ], 25 ],
28 'includes': [ '../../build/grit_target.gypi' ], 26 'includes': [ '../../build/grit_target.gypi' ],
29 # Override the exported include-dirs; ios_theme_resources.h should only be 27 # Override the exported include-dirs; ios_theme_resources.h should only be
30 # referencable as ios/chrome/grit/, to allow DEPS-time checking of usage. 28 # referencable as ios/chrome/grit/, to allow DEPS-time checking of usage.
31 'direct_dependent_settings': { 29 'direct_dependent_settings': {
32 'include_dirs': [ 30 'include_dirs': [
33 '<(grit_base_dir)', 31 '<(grit_base_dir)',
34 ], 32 ],
35 'include_dirs!': [ 33 'include_dirs!': [
36 '<(grit_out_dir)', 34 '<(grit_out_dir)',
37 ], 35 ],
38 }, 36 },
39 }, 37 },
40 ], 38 ],
41 } 39 }
42 40
OLDNEW
« no previous file with comments | « build/grit_action.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698