summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-31 16:36:55 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-31 16:36:55 +0000
commitfeed7efe82409a369d9a475d6c4e8cf36d1b4b49 (patch)
treef8a253cab9f4ccb387eefe30da3dda96399ae895 /chrome_frame
parent14a67b8c2791045fabdda734b100d7cdb541a64c (diff)
downloadchromium_src-feed7efe82409a369d9a475d6c4e8cf36d1b4b49.zip
chromium_src-feed7efe82409a369d9a475d6c4e8cf36d1b4b49.tar.gz
chromium_src-feed7efe82409a369d9a475d6c4e8cf36d1b4b49.tar.bz2
Introduces chromium_resources.gyp to factor out Chrome resource generation
1. Factors out Chrome/Chromium resource generation into a separate chrome_resources.gyp file. 2. Eliminates repetition between Mac and other platforms. 3. Breaks long "repack" actions out into separate files for greater readability. 4. Eliminates circular dependencies in the Aura shell, the Views components, and the compositor when utilizing Chrome resources. BUG=none TEST=try bots run gyps and build correctly. Review URL: http://codereview.chromium.org/8425002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 826510c..a37209a 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -34,10 +34,10 @@
],
'target_defaults': {
'dependencies': [
- '../chrome/chrome.gyp:chrome_resources',
- '../chrome/chrome.gyp:chrome_strings',
- '../chrome/chrome.gyp:packed_resources',
- '../chrome/chrome.gyp:theme_resources',
+ '../chrome/chrome_resources.gyp:chrome_resources',
+ '../chrome/chrome_resources.gyp:chrome_strings',
+ '../chrome/chrome_resources.gyp:packed_resources',
+ '../chrome/chrome_resources.gyp:theme_resources',
'../skia/skia.gyp:skia',
],
'defines': [ 'ISOLATION_AWARE_ENABLED=1' ],
@@ -376,10 +376,10 @@
'dependencies': [
'../base/base.gyp:test_support_base',
'../chrome/chrome.gyp:browser',
- '../chrome/chrome.gyp:chrome_resources',
'../chrome/chrome.gyp:debugger',
'../chrome/chrome.gyp:renderer',
'../chrome/chrome.gyp:syncapi_core',
+ '../chrome/chrome_resources.gyp:chrome_resources',
'../content/content.gyp:content_gpu',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',