diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 18:31:31 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 18:31:31 +0000 |
| commit | 06c756181e0a5fb64b42fa5e69eaa3721fd434ae (patch) | |
| tree | 8c7f2ffc06071945c753e1be209fa2b8aca30ca4 /third_party | |
| parent | 594b8f5fbe9c4838ea6e3f46814986357fbbbea2 (diff) | |
| download | chromium_src-06c756181e0a5fb64b42fa5e69eaa3721fd434ae.zip chromium_src-06c756181e0a5fb64b42fa5e69eaa3721fd434ae.tar.gz chromium_src-06c756181e0a5fb64b42fa5e69eaa3721fd434ae.tar.bz2 | |
gyp: unify toolkit_views usage
Now that we can rely on toolkit_views to be set when appropriate,
we can simplify a bunch of logic in gyp.
TEST=compiles
Review URL: http://codereview.chromium.org/1741010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/ffmpeg/ffmpeg.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 0d661a3..7f42890 100644 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -39,9 +39,9 @@ # Allow overridding the selection of which FFmpeg binaries to copy via an # environment variable. Affects the ffmpeg_binaries target. 'conditions': [ - ['chromeos!=0 or toolkit_views!=0', { + ['chromeos==1', { 'ffmpeg_branding%': '<(branding)OS', - },{ # else chromeos==0, assume Chrome/Chromium. + }, { # otherwise, assume Chrome/Chromium. 'ffmpeg_branding%': '<(branding)', }], ['armv7==1 and arm_neon==1', { |