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

Unified Diff: webkit/glue/webkit_glue.gypi

Issue 8417017: Separate some generated files into their own targets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 1 month 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
« chrome/chrome_browser.gypi ('K') | « chrome/chrome_common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkit_glue.gypi
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index ea8466833f24d8e06d34ddaba9df8130a31c3406..47ad919fbc81c45b05671791f91d79da09f458cf 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -58,11 +58,8 @@
'includes': [ '../../build/grit_target.gypi' ],
},
{
- 'target_name': 'webkit_user_agent',
- 'type': 'static_library',
- 'dependencies': [
- '<(DEPTH)/base/base.gyp:base_i18n',
- ],
+ 'target_name': 'webkit_version',
+ 'type': 'none',
'actions': [
{
'action_name': 'webkit_version',
@@ -72,10 +69,10 @@
'../../build/util/lastchange.py', # Used by the script.
],
'outputs': [
- '<(INTERMEDIATE_DIR)/webkit_version.h',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit_version.h',
Ryan Sleevi 2011/11/03 07:55:18 here as well
],
'action': ['python', '<(script)', '<(webkit_src_dir)',
- '<(version_file)', '<(INTERMEDIATE_DIR)'],
+ '<(version_file)', '<(SHARED_INTERMEDIATE_DIR)'],
'variables': {
'script': '../build/webkit_version.py',
# version_file is a relative path from |webkit_src_dir| to
@@ -86,18 +83,26 @@
},
},
],
- 'include_dirs': [
- '<(INTERMEDIATE_DIR)',
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
+ },
+ # Dependents may rely on files generated by this target or one of its
+ # own hard dependencies.
+ 'hard_dependency': 1,
+ },
+ {
+ 'target_name': 'webkit_user_agent',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'webkit_version',
+ '<(DEPTH)/base/base.gyp:base_i18n',
],
'sources': [
'user_agent.cc',
'user_agent.h',
],
- # Dependents may rely on files generated by this target or one of its
- # own hard dependencies.
- 'hard_dependency': 1,
- 'conditions': [
- ],
},
{
'target_name': 'glue',
« chrome/chrome_browser.gypi ('K') | « chrome/chrome_common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698