summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 19:27:33 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 19:27:33 +0000
commitebee6770f6478f1248330661908f2d15b1476ede (patch)
tree0d6d31136a269b8ffd71a1c9c706ff59b7bbb7ba /chrome_frame
parentd11a4b41d90a2e393fa5908419cf3d97a7d3064b (diff)
downloadchromium_src-ebee6770f6478f1248330661908f2d15b1476ede.zip
chromium_src-ebee6770f6478f1248330661908f2d15b1476ede.tar.gz
chromium_src-ebee6770f6478f1248330661908f2d15b1476ede.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. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=107967 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=108466 Review URL: http://codereview.chromium.org/8425002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108517 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',