diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 15:04:29 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 15:04:29 +0000 |
| commit | 33d2a8a112b1f5ce2943877a279990165a963b37 (patch) | |
| tree | eaf7522effbfe740991751d1e66ed4d89c01d24b /ui | |
| parent | d0084c88b8deb992bbf781b23fb783252ae7d9ab (diff) | |
| download | chromium_src-33d2a8a112b1f5ce2943877a279990165a963b37.zip chromium_src-33d2a8a112b1f5ce2943877a279990165a963b37.tar.gz chromium_src-33d2a8a112b1f5ce2943877a279990165a963b37.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
Review URL: http://codereview.chromium.org/8425002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108466 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/aura.gyp | 6 | ||||
| -rw-r--r-- | ui/aura_shell/aura_shell.gyp | 16 | ||||
| -rw-r--r-- | ui/gfx/compositor/compositor.gyp | 6 |
3 files changed, 4 insertions, 24 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 34ca7efe..d012a80 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -110,6 +110,7 @@ 'type': 'executable', 'dependencies': [ '../../base/base.gyp:test_support_base', + '../../chrome/chrome_resources.gyp:packed_resources', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', '../gfx/compositor/compositor.gyp:compositor_test_support', @@ -143,11 +144,6 @@ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', ], }], - ['OS!="mac"', { - 'dependencies': [ - '../../chrome/chrome.gyp:packed_resources', - ], - }], ], }, ], diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp index 35d2efd7..e46f28d 100644 --- a/ui/aura_shell/aura_shell.gyp +++ b/ui/aura_shell/aura_shell.gyp @@ -85,6 +85,7 @@ 'dependencies': [ '../../base/base.gyp:base', '../../base/base.gyp:test_support_base', + '../../chrome/chrome_resources.gyp:packed_resources', '../../build/temp_gyp/googleurl.gyp:googleurl', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', @@ -115,13 +116,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', ], - 'conditions': [ - ['OS!="mac"', { - 'dependencies': [ - '../../chrome/chrome.gyp:packed_resources', - ], - }], - ], }, { 'target_name': 'aura_shell_exe', @@ -129,6 +123,7 @@ 'dependencies': [ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', + '../../chrome/chrome_resources.gyp:packed_resources', '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', @@ -156,13 +151,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', ], - 'conditions': [ - ['OS!="mac"', { - 'dependencies': [ - '../../chrome/chrome.gyp:packed_resources', - ], - }], - ], }, # It's convenient for aura_shell developers to be able to build all # compositor and aura targets from within this solution. diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp index 5a940ae..a4fac31 100644 --- a/ui/gfx/compositor/compositor.gyp +++ b/ui/gfx/compositor/compositor.gyp @@ -129,6 +129,7 @@ 'dependencies': [ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:test_support_base', + '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', @@ -166,11 +167,6 @@ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', ], }], - ['OS!="mac"', { - 'dependencies': [ - '<(DEPTH)/chrome/chrome.gyp:packed_resources', - ], - }], ], }, { |