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

Unified Diff: content/content_shell.gypi

Issue 273783002: Simplify content_shell_resources target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/shell/app_shell.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
« no previous file with comments | « apps/shell/app_shell.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698