| Index: content/content_shell.gypi
|
| diff --git a/content/content_shell.gypi b/content/content_shell.gypi
|
| index 598fb305aeee38215980721454e127150c90548d..230853759c43419c31d0ae25a742780c08d97309 100644
|
| --- a/content/content_shell.gypi
|
| +++ b/content/content_shell.gypi
|
| @@ -365,12 +365,18 @@
|
| {
|
| 'target_name': 'content_shell_resources',
|
| 'type': 'none',
|
| - 'dependencies': [
|
| - 'generate_content_shell_resources',
|
| - ],
|
| 'variables': {
|
| 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
|
| },
|
| + 'actions': [
|
| + {
|
| + 'action_name': 'generate_content_shell_resources',
|
| + 'variables': {
|
| + 'grit_grd_file': 'shell/shell_resources.grd',
|
| + },
|
| + 'includes': [ '../build/grit_action.gypi' ],
|
| + },
|
| + ],
|
| 'includes': [ '../build/grit_target.gypi' ],
|
| 'copies': [
|
| {
|
| @@ -419,22 +425,6 @@
|
| ],
|
| },
|
| {
|
| - 'target_name': 'generate_content_shell_resources',
|
| - 'type': 'none',
|
| - 'variables': {
|
| - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
|
| - },
|
| - 'actions': [
|
| - {
|
| - 'action_name': 'content_shell_resources',
|
| - 'variables': {
|
| - 'grit_grd_file': 'shell/shell_resources.grd',
|
| - },
|
| - 'includes': [ '../build/grit_action.gypi' ],
|
| - },
|
| - ],
|
| - },
|
| - {
|
| # We build a minimal set of resources so WebKit in content_shell has
|
| # access to necessary resources.
|
| 'target_name': 'content_shell_pak',
|
|
|