diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 21:52:18 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 21:52:18 +0000 |
| commit | 2380baad5e1c42527ee6f38165201328daf624ab (patch) | |
| tree | 1b0cdc7b568dde58e7f31d1c23ab8073b2570121 | |
| parent | accbbc95f7149eb3ae6d15b495732ce0042be013 (diff) | |
| download | chromium_src-2380baad5e1c42527ee6f38165201328daf624ab.zip chromium_src-2380baad5e1c42527ee6f38165201328daf624ab.tar.gz chromium_src-2380baad5e1c42527ee6f38165201328daf624ab.tar.bz2 | |
Don't depend on (empty) chromeos-only display target
Otherwise, when display.dll is built in component it won't generated display.dll.lib (the import library). This is empty on non-cros.
This causes dependents to fail to link with:
FAILED: C:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-with-manifests environment.x64 True ash_shell_unittests.exe "C:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-wrapper environment.x64 False link.exe /nologo /OUT:ash_shell_unittests.exe @ash_shell_unittests.exe.rsp" 1 mt.exe rc.exe "obj\ash\ash_shell_unittests.ash_shell_unittests.exe.intermediate.manifest" obj\ash\ash_shell_unittests.ash_shell_unittests.exe.generated.manifest ..\..\build\win\compatibility.manifest
LINK : fatalerror LNK1104: cannot open file 'display.dll.lib'
This only occurs on x64 because the x86 is non-component. It didn't get caught on the waterfall because there's no clobber x64 builder yet.
R=huangs@chromium.org, wfh@chromium.org
BUG=
Review URL: https://codereview.chromium.org/287013005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270825 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/ash.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 0b0f11a..aa8ab77 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -1205,7 +1205,6 @@ '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../ui/accessibility/accessibility.gyp:ax_gen', - '../ui/display/display.gyp:display', 'ash_shell_lib', 'ash_test_support', ], @@ -1213,6 +1212,13 @@ 'shell/window_watcher_unittest.cc', 'test/ash_unittests.cc', ], + 'conditions': [ + ['chromeos==1', { + 'dependencies': [ + '../ui/display/display.gyp:display', + ], + }], + ], }, ], } |