| Index: ui/aura_shell/aura_shell.gyp
|
| diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
|
| index 35d2efd72387e6bd54e383de6cf7b048385c887b..e46f28d4a033e7dfda4bbdd803045d9c9b0fbf98 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.
|
|
|