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

Side by Side Diff: content/content_shell.gypi

Issue 398243002: Fix the path to blink_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/content_child.gypi ('k') | content/content_tests.gypi » ('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 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 # We build a minimal set of resources so WebKit in content_shell has 426 # We build a minimal set of resources so WebKit in content_shell has
427 # access to necessary resources. 427 # access to necessary resources.
428 # GN version: //content/shell:pak 428 # GN version: //content/shell:pak
429 'target_name': 'content_shell_pak', 429 'target_name': 'content_shell_pak',
430 'type': 'none', 430 'type': 'none',
431 'dependencies': [ 431 'dependencies': [
432 'browser/tracing/tracing_resources.gyp:tracing_resources', 432 'browser/tracing/tracing_resources.gyp:tracing_resources',
433 'content_resources.gyp:content_resources', 433 'content_resources.gyp:content_resources',
434 'content_shell_resources', 434 'content_shell_resources',
435 '<(DEPTH)/net/net.gyp:net_resources', 435 '<(DEPTH)/net/net.gyp:net_resources',
436 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources' ,
436 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 437 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
437 '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings', 438 '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
438 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 439 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
439 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 440 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
440 ], 441 ],
441 'conditions': [ 442 'conditions': [
442 ['OS!="android"', { 443 ['OS!="android"', {
443 'dependencies': [ 444 'dependencies': [
444 'browser/devtools/devtools_resources.gyp:devtools_resources', 445 'browser/devtools/devtools_resources.gyp:devtools_resources',
445 ], 446 ],
446 }], 447 }],
447 ], 448 ],
448 'actions': [ 449 'actions': [
449 { 450 {
450 'action_name': 'repack_content_shell_pack', 451 'action_name': 'repack_content_shell_pack',
451 'variables': { 452 'variables': {
452 'pak_inputs': [ 453 'pak_inputs': [
454 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources .pak',
455 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resour ces.pak',
453 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', 456 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
454 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resour ces.pak',
455 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', 457 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
456 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 458 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
457 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak', 459 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
458 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', 460 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
459 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak', 461 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak',
460 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', 462 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
461 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
462 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pa k', 463 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pa k',
463 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', 464 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
464 ], 465 ],
465 'conditions': [ 466 'conditions': [
466 ['OS!="android"', { 467 ['OS!="android"', {
467 'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resou rces.pak',], 468 'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resou rces.pak',],
468 'pak_output': '<(PRODUCT_DIR)/content_shell.pak', 469 'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
469 }, { 470 }, {
470 'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell .pak', 471 'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell .pak',
471 }], 472 }],
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1093 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1093 '--destination_dir', '<(dest_dir)', 1094 '--destination_dir', '<(dest_dir)',
1094 ], 1095 ],
1095 }, 1096 },
1096 ], 1097 ],
1097 }, 1098 },
1098 ], 1099 ],
1099 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1100 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1100 ] 1101 ]
1101 } 1102 }
OLDNEW
« no previous file with comments | « content/content_child.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698