diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 20:57:28 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 20:57:28 +0000 |
| commit | 6fb8d07549e52937a293f8300353583d92975e7e (patch) | |
| tree | 1fcba3e5f06ca2372314a933c147af97e94bb573 | |
| parent | 5a7bc8699354d5aeb886bf18bcfd05b2d1c9654a (diff) | |
| download | chromium_src-6fb8d07549e52937a293f8300353583d92975e7e.zip chromium_src-6fb8d07549e52937a293f8300353583d92975e7e.tar.gz chromium_src-6fb8d07549e52937a293f8300353583d92975e7e.tar.bz2 | |
Use chromeos branding for toolkit_views build.
This is temp change until we fully migrage chromeos build to views. I'll revert this change once it happens.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/516011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35231 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index ce07ca5..07f53afb 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -25,7 +25,7 @@ # Allow overridding the selection of which FFmpeg binaries to copy via an # environment variable. Affects the ffmpeg_binaries target. 'conditions': [ - ['chromeos!=0', { + ['chromeos!=0 or toolkit_views!=0', { 'ffmpeg_branding%': '<(branding)OS', },{ # else chromeos==0, assume Chrome/Chromium. 'ffmpeg_branding%': '<(branding)', |