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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 1857983002: Add download_file_types.proto with ascii->binary conversion, as a resource. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'variables': { 5 'variables': {
6 # Apply Chrome-specific grit settings to all of this file. 6 # Apply Chrome-specific grit settings to all of this file.
7 # The advantage is that one entry here applies to the entire file. 7 # The advantage is that one entry here applies to the entire file.
8 # The caveat is these variables cannot be merged with other variable 8 # The caveat is these variables cannot be merged with other variable
9 # dictionaries in more inner scopes. If the variable should be merged, 9 # dictionaries in more inner scopes. If the variable should be merged,
10 # consider putting them in a gypi file and including it at the right scope 10 # consider putting them in a gypi file and including it at the right scope
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 { 215 {
216 # GN version: //chrome/common:extensions_api_resources 216 # GN version: //chrome/common:extensions_api_resources
217 'action_name': 'generate_extensions_api_resources', 217 'action_name': 'generate_extensions_api_resources',
218 'variables': { 218 'variables': {
219 'grit_grd_file': 'common/extensions_api_resources.grd', 219 'grit_grd_file': 'common/extensions_api_resources.grd',
220 }, 220 },
221 'includes': [ 'chrome_grit_action.gypi' ], 221 'includes': [ 'chrome_grit_action.gypi' ],
222 } 222 }
223 ], 223 ],
224 }], 224 }],
225 ['OS != "android" and OS != "ios"', {
226 'dependencies': [ 'make_file_types_protobuf' ]
Lei Zhang 2016/04/04 21:24:48 2 space indent, not 1.
Nathan Parker 2016/04/04 22:00:53 Done.
227 }],
225 ], 228 ],
226 'includes': [ '../build/grit_target.gypi' ], 229 'includes': [ '../build/grit_target.gypi' ],
227 }, 230 },
228 { 231 {
229 # TODO(mark): It would be better if each static library that needed 232 # TODO(mark): It would be better if each static library that needed
230 # to run grit would list its own .grd files, but unfortunately some 233 # to run grit would list its own .grd files, but unfortunately some
231 # of the static libraries currently have circular dependencies among 234 # of the static libraries currently have circular dependencies among
232 # generated headers. 235 # generated headers.
233 # 236 #
234 # GN version: //chrome:strings 237 # GN version: //chrome:strings
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 { 289 {
287 # GN version: //chrome/app:settings_google_chrome_strings 290 # GN version: //chrome/app:settings_google_chrome_strings
288 'action_name': 'generate_settings_google_chrome_strings', 291 'action_name': 'generate_settings_google_chrome_strings',
289 'variables': { 292 'variables': {
290 'grit_grd_file': 'app/settings_google_chrome_strings.grd', 293 'grit_grd_file': 'app/settings_google_chrome_strings.grd',
291 }, 294 },
292 'includes': [ 'chrome_grit_action.gypi' ], 295 'includes': [ 'chrome_grit_action.gypi' ],
293 }, 296 },
294 ], 297 ],
295 }, 298 },
299
300 {
301 # GN version: //chrome/browser/resources/safe_browsing:make_file_types_pro tobuf
302 # Convert the ascii proto file to a binary resource.
303 'target_name': 'make_file_types_protobuf',
304 'type': 'none',
305 'hard_dependency': 1,
306 'dependencies': [
307 'chrome.gyp:safe_browsing_proto',
Lei Zhang 2016/04/04 21:24:48 2 space indent, not 4.
Nathan Parker 2016/04/04 22:00:53 Done. Vim wants to do 4.
308 ],
309 'actions': [
310 {
311 'action_name': 'generate_file_types_protobuf',
312 'variables' : {
313 'script_file':'browser/resources/safe_browsing/gen_file_type_proto.p y',
314 'asciipb_file' : 'browser/resources/safe_browsing/download_file_type s.asciipb',
315 'output_file' : '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources /safe_browsing/download_file_types.pb',
316 },
317 'inputs': [
318 '<(script_file)',
319 '<(asciipb_file)',
320 ],
321 'outputs': [
322 '<(output_file)',
323 ],
324 'action': [
325 'python', '<(script_file)',
326 '-i', '<(asciipb_file)',
327 '-o', '<(output_file)',
328 '-p', '<(PRODUCT_DIR)/pyproto/chrome/common/safe_browsing',
329 ],
330 'message': 'Generating download_file_types.pb.',
331 }
332 ],
333 },
296 { 334 {
297 # GN version: //chrome/browser/metrics/variations:chrome_ui_string_overrid er_factory_gen_sources 335 # GN version: //chrome/browser/metrics/variations:chrome_ui_string_overrid er_factory_gen_sources
298 'target_name': 'make_chrome_ui_string_overrider_factory', 336 'target_name': 'make_chrome_ui_string_overrider_factory',
299 'type': 'none', 337 'type': 'none',
300 'hard_dependency': 1, 338 'hard_dependency': 1,
301 'dependencies': [ 339 'dependencies': [
302 'chrome_strings', 340 'chrome_strings',
303 '../components/components_strings.gyp:components_strings', 341 '../components/components_strings.gyp:components_strings',
304 ], 342 ],
305 'actions': [ 343 'actions': [
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', 719 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
682 ], 720 ],
683 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', 721 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
684 }, 722 },
685 'includes': [ '../build/repack_action.gypi' ], 723 'includes': [ '../build/repack_action.gypi' ],
686 }, 724 },
687 ], 725 ],
688 }, 726 },
689 ], # targets 727 ], # targets
690 } 728 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698