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

Side by Side Diff: content/content_shell.gypi

Issue 1581253003: Add missing 'hard_dependency' in gyp targets using grit_action (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « content/content_resources.gypi ('k') | device/bluetooth/bluetooth_strings.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 (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 { 5 {
6 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 'content_shell_version': '99.77.34.5', 8 'content_shell_version': '99.77.34.5',
9 'conditions': [ 9 'conditions': [
10 ['OS=="linux"', { 10 ['OS=="linux"', {
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 'shell/browser/shell_plugin_service_filter.cc', 334 'shell/browser/shell_plugin_service_filter.cc',
335 'shell/browser/shell_plugin_service_filter.h', 335 'shell/browser/shell_plugin_service_filter.h',
336 ], 336 ],
337 }] 337 }]
338 ], 338 ],
339 }, 339 },
340 { 340 {
341 # GN version: //content/shell:resources 341 # GN version: //content/shell:resources
342 'target_name': 'content_shell_resources', 342 'target_name': 'content_shell_resources',
343 'type': 'none', 343 'type': 'none',
344 'hard_dependency': 1,
344 'variables': { 345 'variables': {
345 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content', 346 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
346 }, 347 },
347 'dependencies': [ 348 'dependencies': [
348 '../components/test_runner/test_runner.gyp:resources', 349 '../components/test_runner/test_runner.gyp:resources',
349 ], 350 ],
350 'actions': [ 351 'actions': [
351 { 352 {
352 'action_name': 'generate_content_shell_resources', 353 'action_name': 'generate_content_shell_resources',
353 'variables': { 354 'variables': {
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 ], 921 ],
921 }], 922 }],
922 ['v8_use_external_startup_data==1', { 923 ['v8_use_external_startup_data==1', {
923 'additional_input_paths': [ 924 'additional_input_paths': [
924 '<(asset_location)/natives_blob_<(arch_suffix).bin', 925 '<(asset_location)/natives_blob_<(arch_suffix).bin',
925 '<(asset_location)/snapshot_blob_<(arch_suffix).bin', 926 '<(asset_location)/snapshot_blob_<(arch_suffix).bin',
926 ], 927 ],
927 }], 928 }],
928 ], 929 ],
929 }, 930 },
930 'includes': [ 931 'includes': [
931 '../build/android/v8_external_startup_data_arch_suffix.gypi', 932 '../build/android/v8_external_startup_data_arch_suffix.gypi',
932 '../build/java_apk.gypi', 933 '../build/java_apk.gypi',
933 ], 934 ],
934 }, 935 },
935 ], 936 ],
936 }], # OS=="android" 937 }], # OS=="android"
937 ['OS=="win"', { 938 ['OS=="win"', {
938 'targets': [ 939 'targets': [
939 { 940 {
940 # GN version: //content/shell:crash_service 941 # GN version: //content/shell:crash_service
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
986 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 987 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
987 '--destination_dir', '<(dest_dir)', 988 '--destination_dir', '<(dest_dir)',
988 ], 989 ],
989 }, 990 },
990 ], 991 ],
991 }, 992 },
992 ], 993 ],
993 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 994 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
994 ] 995 ]
995 } 996 }
OLDNEW
« no previous file with comments | « content/content_resources.gypi ('k') | device/bluetooth/bluetooth_strings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698