From 6fb8d07549e52937a293f8300353583d92975e7e Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Wed, 23 Dec 2009 20:57:28 +0000 Subject: 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 --- third_party/ffmpeg/ffmpeg.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)', -- cgit v1.1