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

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

Issue 1489403004: Remove default whitelist for grit on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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 | « components/components_strings.gyp ('k') | ios/chrome/ios_today_extension_resources.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 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 'ui_string_overrider_inputs': [ 10 'ui_string_overrider_inputs': [
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 { 42 {
43 # GN version: //ios/chrome/app/strings 43 # GN version: //ios/chrome/app/strings
44 'target_name': 'ios_strings_gen', 44 'target_name': 'ios_strings_gen',
45 'type': 'none', 45 'type': 'none',
46 'hard_dependency': 1, 46 'hard_dependency': 1,
47 'actions': [ 47 'actions': [
48 { 48 {
49 # GN version: //ios/chrome/app/strings:ios_locale_settings 49 # GN version: //ios/chrome/app/strings:ios_locale_settings
50 'action_name': 'generate_ios_locale_settings', 50 'action_name': 'generate_ios_locale_settings',
51 'variables': { 51 'variables': {
52 'grit_whitelist': '',
53 'grit_grd_file': 'app/strings/ios_locale_settings.grd', 52 'grit_grd_file': 'app/strings/ios_locale_settings.grd',
54 }, 53 },
55 'includes': [ '../../build/grit_action.gypi' ], 54 'includes': [ '../../build/grit_action.gypi' ],
56 }, 55 },
57 { 56 {
58 # GN version: //ios/chrome/app/strings:ios_strings 57 # GN version: //ios/chrome/app/strings:ios_strings
59 'action_name': 'generate_ios_strings', 58 'action_name': 'generate_ios_strings',
60 'variables': { 59 'variables': {
61 'grit_whitelist': '',
62 'grit_grd_file': 'app/strings/ios_strings.grd', 60 'grit_grd_file': 'app/strings/ios_strings.grd',
63 }, 61 },
64 'includes': [ '../../build/grit_action.gypi' ], 62 'includes': [ '../../build/grit_action.gypi' ],
65 }, 63 },
66 { 64 {
67 # GN version: //ios/chrome/app/strings:ios_chromium_strings 65 # GN version: //ios/chrome/app/strings:ios_chromium_strings
68 'action_name': 'generate_ios_chromium_strings', 66 'action_name': 'generate_ios_chromium_strings',
69 'variables': { 67 'variables': {
70 'grit_whitelist': '',
71 'grit_grd_file': 'app/strings/ios_chromium_strings.grd', 68 'grit_grd_file': 'app/strings/ios_chromium_strings.grd',
72 }, 69 },
73 'includes': [ '../../build/grit_action.gypi' ], 70 'includes': [ '../../build/grit_action.gypi' ],
74 }, 71 },
75 { 72 {
76 # GN version: //ios/chrome/app/strings:ios_google_chrome_strings 73 # GN version: //ios/chrome/app/strings:ios_google_chrome_strings
77 'action_name': 'generate_ios_google_chrome_strings', 74 'action_name': 'generate_ios_google_chrome_strings',
78 'variables': { 75 'variables': {
79 'grit_whitelist': '',
80 'grit_grd_file': 'app/strings/ios_google_chrome_strings.grd', 76 'grit_grd_file': 'app/strings/ios_google_chrome_strings.grd',
81 }, 77 },
82 'includes': [ '../../build/grit_action.gypi' ], 78 'includes': [ '../../build/grit_action.gypi' ],
83 }, 79 },
84 ], 80 ],
85 'includes': [ '../../build/grit_target.gypi' ], 81 'includes': [ '../../build/grit_target.gypi' ],
86 # Override the exported include-dirs; ios/chrome/grit/ios_*strings.h 82 # Override the exported include-dirs; ios/chrome/grit/ios_*strings.h
87 # should only be referenceable as ios/chrome/grit to allow DEPS-time 83 # should only be referenceable as ios/chrome/grit to allow DEPS-time
88 # checking of usage. 84 # checking of usage.
89 'direct_dependent_settings': { 85 'direct_dependent_settings': {
90 'include_dirs': [ 86 'include_dirs': [
91 '<(grit_base_dir)', 87 '<(grit_base_dir)',
92 ], 88 ],
93 'include_dirs!': [ 89 'include_dirs!': [
94 '<(grit_out_dir)', 90 '<(grit_out_dir)',
95 ], 91 ],
96 } 92 }
97 }, 93 },
98 { 94 {
99 # GN version: //ios/chrome/app/theme 95 # GN version: //ios/chrome/app/theme
100 'target_name': 'ios_theme_resources_gen', 96 'target_name': 'ios_theme_resources_gen',
101 'type': 'none', 97 'type': 'none',
102 'hard_dependency': 1, 98 'hard_dependency': 1,
103 'actions': [ 99 'actions': [
104 { 100 {
105 'action_name': 'ios_theme_resources', 101 'action_name': 'ios_theme_resources',
106 'variables': { 102 'variables': {
107 'grit_whitelist': '',
108 'grit_grd_file': 'app/theme/ios_theme_resources.grd', 103 'grit_grd_file': 'app/theme/ios_theme_resources.grd',
109 }, 104 },
110 'includes': [ '../../build/grit_action.gypi' ], 105 'includes': [ '../../build/grit_action.gypi' ],
111 }, 106 },
112 ], 107 ],
113 'includes': [ '../../build/grit_target.gypi' ], 108 'includes': [ '../../build/grit_target.gypi' ],
114 # Override the exported include-dirs; ios_theme_resources.h should only be 109 # Override the exported include-dirs; ios_theme_resources.h should only be
115 # referencable as ios/chrome/grit/ to allow DEPS-time checking of usage. 110 # referencable as ios/chrome/grit/ to allow DEPS-time checking of usage.
116 'direct_dependent_settings': { 111 'direct_dependent_settings': {
117 'include_dirs': [ 112 'include_dirs': [
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 '../../components/components.gyp:variations_service', 248 '../../components/components.gyp:variations_service',
254 'ios_chrome_ui_string_overrider_factory_gen', 249 'ios_chrome_ui_string_overrider_factory_gen',
255 ], 250 ],
256 'sources': [ 251 'sources': [
257 '<(SHARED_INTERMEDIATE_DIR)/<(ui_string_overrider_output_basename).cc', 252 '<(SHARED_INTERMEDIATE_DIR)/<(ui_string_overrider_output_basename).cc',
258 '<(SHARED_INTERMEDIATE_DIR)/<(ui_string_overrider_output_basename).h', 253 '<(SHARED_INTERMEDIATE_DIR)/<(ui_string_overrider_output_basename).h',
259 ], 254 ],
260 }, 255 },
261 ], 256 ],
262 } 257 }
OLDNEW
« no previous file with comments | « components/components_strings.gyp ('k') | ios/chrome/ios_today_extension_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698