diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 18:24:12 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 18:24:12 +0000 |
| commit | 564210fce2cac122f0fdb92cf1bada9b81aa8851 (patch) | |
| tree | d2b0cc7bf1d88c5355e5cfbfc3c12e886179f0af /chrome_frame/chrome_frame.gyp | |
| parent | ff4113032669c7ee0a4c68a0d15a40681d3f2d98 (diff) | |
| download | chromium_src-564210fce2cac122f0fdb92cf1bada9b81aa8851.zip chromium_src-564210fce2cac122f0fdb92cf1bada9b81aa8851.tar.gz chromium_src-564210fce2cac122f0fdb92cf1bada9b81aa8851.tar.bz2 | |
Revert 107967 - 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
TBR=dhollowa@chromium.org
Review URL: http://codereview.chromium.org/8430011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index a37209a..826510c 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -34,10 +34,10 @@ ], 'target_defaults': { 'dependencies': [ - '../chrome/chrome_resources.gyp:chrome_resources', - '../chrome/chrome_resources.gyp:chrome_strings', - '../chrome/chrome_resources.gyp:packed_resources', - '../chrome/chrome_resources.gyp:theme_resources', + '../chrome/chrome.gyp:chrome_resources', + '../chrome/chrome.gyp:chrome_strings', + '../chrome/chrome.gyp:packed_resources', + '../chrome/chrome.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', |