diff options
| author | mmaxfield@google.com <mmaxfield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 01:31:46 +0000 |
|---|---|---|
| committer | mmaxfield@google.com <mmaxfield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 01:31:46 +0000 |
| commit | b581eb4018b4002d9abd853bed233006c5920c1c (patch) | |
| tree | d467f19c307c787efb03150954811e4dea085813 /content/content_shell.gypi | |
| parent | 4cb18ed60b9285a0e96007ef95d973ab7443194e (diff) | |
| download | chromium_src-b581eb4018b4002d9abd853bed233006c5920c1c.zip chromium_src-b581eb4018b4002d9abd853bed233006c5920c1c.tar.gz chromium_src-b581eb4018b4002d9abd853bed233006c5920c1c.tar.bz2 | |
Working around http://code.google.com/p/gyp/issues/detail?id=13
Visual Studio doesn't guarantee the 'copies' stanza is executed after the grit target, which can lead to a failure if it tries to copy the file before it's been generated. This puts the grit action in its own target, and making the copies stanza its own target that depends on the grit target.
Review URL: http://codereview.chromium.org/9581030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index d89d38f..d809c85 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -122,18 +122,12 @@ { 'target_name': 'content_shell_resources', 'type': 'none', + 'dependencies': [ + 'generate_content_shell_resources', + ], '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' ], - }, - ], 'includes': [ '../build/grit_target.gypi' ], 'copies': [ { @@ -143,6 +137,21 @@ ], }, ], + }, { + '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 |