diff options
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, 24 insertions, 4 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index d012a80..34ca7efe 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -110,7 +110,6 @@ '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', @@ -144,6 +143,11 @@ '<(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 e46f28d..35d2efd7 100644 --- a/ui/aura_shell/aura_shell.gyp +++ b/ui/aura_shell/aura_shell.gyp @@ -85,7 +85,6 @@ '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', @@ -116,6 +115,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', + ], + }], + ], }, { 'target_name': 'aura_shell_exe', @@ -123,7 +129,6 @@ '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', @@ -151,6 +156,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. diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp index a4fac31..5a940ae 100644 --- a/ui/gfx/compositor/compositor.gyp +++ b/ui/gfx/compositor/compositor.gyp @@ -129,7 +129,6 @@ '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', @@ -167,6 +166,11 @@ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', ], }], + ['OS!="mac"', { + 'dependencies': [ + '<(DEPTH)/chrome/chrome.gyp:packed_resources', + ], + }], ], }, { |