diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-06 07:38:13 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-06 07:38:13 +0000 |
| commit | affd2f830cfa29c189634e06a9f08e0e28df98e9 (patch) | |
| tree | 6a4c2fc3189b3f2e6301f03dd74c3e046b363500 /chrome | |
| parent | dfedf4e35ad586669f197254794290cb4e53c455 (diff) | |
| download | chromium_src-affd2f830cfa29c189634e06a9f08e0e28df98e9.zip chromium_src-affd2f830cfa29c189634e06a9f08e0e28df98e9.tar.gz chromium_src-affd2f830cfa29c189634e06a9f08e0e28df98e9.tar.bz2 | |
Include wallpaper to win_aura's executables
This fixes crash at startup time.
BUG=151870
TEST=ash_shell.exe no longer crash at startup
Review URL: https://chromiumcodereview.appspot.com/11026075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_dll.gypi | 5 | ||||
| -rw-r--r-- | chrome/chrome_resources.gyp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 246b01c..b70ab12 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -53,6 +53,11 @@ '../ui/compositor/compositor.gyp:compositor', ], }], + ['use_ash==1', { + 'sources': [ + '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc', + ], + }], ['OS=="win"', { 'product_name': 'chrome', 'dependencies': [ diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 8018ceb..867ecaf 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -300,7 +300,7 @@ }, ], 'conditions': [ - ['use_aura==1', { + ['use_ash==1', { 'dependencies': [ '<(DEPTH)/ash/ash.gyp:ash_resources', '<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources', |