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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 1929693003: Populate download_file_types proto and filter it for each platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@file_type_polices2
Patch Set: fix chromeos detection again Created 4 years, 7 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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 'chrome.gyp:safe_browsing_proto', 307 'chrome.gyp:safe_browsing_proto',
308 '<(DEPTH)/third_party/protobuf/protobuf.gyp:py_proto', 308 '<(DEPTH)/third_party/protobuf/protobuf.gyp:py_proto',
309 ], 309 ],
310 'actions': [ 310 'actions': [
311 { 311 {
312 'action_name': 'generate_file_types_protobuf', 312 'action_name': 'generate_file_types_protobuf',
313 'variables' : { 313 'variables' : {
314 'script_file':'browser/resources/safe_browsing/gen_file_type_proto.p y', 314 'script_file':'browser/resources/safe_browsing/gen_file_type_proto.p y',
315 'asciipb_file' : 'browser/resources/safe_browsing/download_file_type s.asciipb', 315 'asciipb_file' : 'browser/resources/safe_browsing/download_file_type s.asciipb',
316 'output_file' : '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources /safe_browsing/download_file_types.pb', 316 'output_file' : '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources /safe_browsing/download_file_types.pb',
317 'conditions': [
318 ['OS=="android"', { 'platform': 'android' },],
319 ['chromeos==1', { 'platform': 'chromeos' },],
320 ['OS=="linux" and chromeos!=1', { 'platform': 'linux' },],
Lei Zhang 2016/05/09 23:28:01 Can you try using the else-if feature in GYP? I t
Nathan Parker 2016/05/10 17:33:51 ooo, didn't know that was possible. Done.
321 ['OS=="mac"', { 'platform': 'mac' },],
322 ['OS=="win"', { 'platform': 'win' },],
323 ],
317 }, 324 },
318 'inputs': [ 325 'inputs': [
319 '<(script_file)', 326 '<(script_file)',
320 '<(asciipb_file)', 327 '<(asciipb_file)',
321 ], 328 ],
322 'outputs': [ 329 'outputs': [
323 '<(output_file)', 330 '<(output_file)',
324 ], 331 ],
325 'action': [ 332 'action': [
326 'python', 333 'python',
327 '<(script_file)', 334 '<(script_file)',
328 '-w', 335 '-w',
329 '-i', '<(asciipb_file)', 336 '-i', '<(asciipb_file)',
330 '-o', '<(output_file)', 337 '-o', '<(output_file)',
338 '-t', '<(platform)',
331 '-p', '<(PRODUCT_DIR)/pyproto', 339 '-p', '<(PRODUCT_DIR)/pyproto',
332 '-p', '<(PRODUCT_DIR)/pyproto/chrome/common/safe_browsing', 340 '-p', '<(PRODUCT_DIR)/pyproto/chrome/common/safe_browsing',
333 ], 341 ],
334 'message': 'Generating download_file_types.pb.', 342 'message': 'Generating download_file_types.pb.',
335 } 343 }
336 ], 344 ],
337 }, 345 },
338 { 346 {
339 # GN version: //chrome/browser/metrics/variations:chrome_ui_string_overrid er_factory_gen_sources 347 # GN version: //chrome/browser/metrics/variations:chrome_ui_string_overrid er_factory_gen_sources
340 'target_name': 'make_chrome_ui_string_overrider_factory', 348 'target_name': 'make_chrome_ui_string_overrider_factory',
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak', 731 '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
724 ], 732 ],
725 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak', 733 'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
726 }, 734 },
727 'includes': [ '../build/repack_action.gypi' ], 735 'includes': [ '../build/repack_action.gypi' ],
728 }, 736 },
729 ], 737 ],
730 }, 738 },
731 ], # targets 739 ], # targets
732 } 740 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698