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

Unified Diff: chrome/chrome_common.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
Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 9c2c4c200db369ce48217be42d08aacc8b4718d9..136b275687fb62a7ff64ad7e58ec33e2f46200a2 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -27,6 +27,7 @@
'chrome_strings',
'common_constants',
'common_net',
+ 'common_version',
'default_plugin/default_plugin.gyp:default_plugin',
'theme_resources',
'../base/base.gyp:base',
@@ -268,10 +269,39 @@
'default_plugin/default_plugin.gyp:default_plugin',
],
}],
- ['os_posix == 1 and OS != "mac"', {
+ ['OS=="linux" and selinux==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:selinux',
+ ],
+ }],
+ ['OS=="mac"', {
+ 'dependencies': [
+ '../third_party/mach_override/mach_override.gyp:mach_override',
+ ],
'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)',
+ '../third_party/GTM',
+ ],
+ }],
+ ['remoting==1', {
+ 'dependencies': [
+ '../remoting/remoting.gyp:remoting_client_plugin',
],
+ }],
+ ],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ ],
+ },
+ {
+ 'target_name': 'common_version',
+ 'type': 'none',
+ 'conditions': [
+ ['os_posix == 1 and OS != "mac"', {
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
+ },
# Because posix_version generates a header, we must set the
# hard_dependency flag.
'hard_dependency': 1,
@@ -320,27 +350,6 @@
},
],
}],
- ['OS=="linux" and selinux==1', {
- 'dependencies': [
- '../build/linux/system.gyp:selinux',
- ],
- }],
- ['OS=="mac"', {
- 'dependencies': [
- '../third_party/mach_override/mach_override.gyp:mach_override',
- ],
- 'include_dirs': [
- '../third_party/GTM',
- ],
- }],
- ['remoting==1', {
- 'dependencies': [
- '../remoting/remoting.gyp:remoting_client_plugin',
- ],
- }],
- ],
- 'export_dependent_settings': [
- '../base/base.gyp:base',
],
},
{

Powered by Google App Engine
This is Rietveld 408576698