diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 18:16:33 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 18:16:33 +0000 |
| commit | 94b9d1c908780629f4994aad1ea84e77dac43718 (patch) | |
| tree | d5b16dce2736c0d6b87e7d347c9f29116c1ccf15 /ui/aura_shell | |
| parent | ef3326709df5da0b95ffec975e58c8c9e9245415 (diff) | |
| download | chromium_src-94b9d1c908780629f4994aad1ea84e77dac43718.zip chromium_src-94b9d1c908780629f4994aad1ea84e77dac43718.tar.gz chromium_src-94b9d1c908780629f4994aad1ea84e77dac43718.tar.bz2 | |
USE_AURA=1 Reveals circular dependencies on Mac.
This changes Aura related .gyp files to conditionally depend on the chrome.gyp:packed_resources target, which is non-Mac target.
Also, this unifies mixed "../..", "..", and "<(DEPTH)" usage to prefer the ".." form from advice from mento@.
BUG=None
TEST=build/gyp_chromium completes on Mac. Compiles and passes existing tests on other platforms.
Review URL: http://codereview.chromium.org/8159011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/aura_shell.gyp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp index 8cba09e..edd2d1f 100644 --- a/ui/aura_shell/aura_shell.gyp +++ b/ui/aura_shell/aura_shell.gyp @@ -20,13 +20,13 @@ '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', + '../../views/views.gyp:views', + '../aura/aura.gyp:aura', '../base/strings/ui_strings.gyp:ui_strings', '../gfx/compositor/compositor.gyp:compositor', '../ui.gyp:ui', '../ui.gyp:ui_resources', '../ui.gyp:ui_resources_standard', - '../aura/aura.gyp:aura', - '../../views/views.gyp:views', ], 'sources': [ # All .cc, .h under views, except unittests @@ -79,7 +79,6 @@ 'dependencies': [ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', - '../../chrome/chrome.gyp:packed_resources', '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', @@ -105,6 +104,13 @@ '<(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. @@ -112,15 +118,15 @@ 'target_name': 'buildbot_targets', 'type': 'none', 'dependencies': [ - 'aura_shell_exe', - '../aura/aura.gyp:*', - '../gfx/compositor/compositor.gyp:*', '../../views/views.gyp:views', '../../views/views.gyp:views_aura_desktop', '../../views/views.gyp:views_desktop', '../../views/views.gyp:views_desktop_lib', '../../views/views.gyp:views_unittests', + '../aura/aura.gyp:*', + '../gfx/compositor/compositor.gyp:*', + 'aura_shell_exe', ], - }, + }, ], } |