gyp: unify toolkit_views usage

third_party/ffmpeg/ffmpeg.gyp

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # There's a couple key GYP variables that control how FFmpeg is built:
 #   ffmpeg_branding
 #     Controls whether we build the Chromium or Google Chrome version of
 #     FFmpeg.  The Google Chrome version contains additional codecs.
 #     Typical values are Chromium, Chrome, ChromiumOS, and ChromeOS.
 #   use_system_ffmpeg
@@ skipping 21 matching lines @@
       # If you want -O0, see the Gotchas in README.Chromium for why that
       # won't work.
       'debug_optimize': '2',
       'mac_debug_optimization': '2',
     },
   },
   'variables': {
     # 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', {

[Daniel Erat, 2010/04/27 01:12:25]

Am I misreading this, or does it change the logic?  Did this match e.g. Windows
before?

[Evan Martin, 2010/04/27 01:16:20]

You are right.  But I think it was wrong before.

(That is, with the old we'd call ourselves ChromeOS on a toolkit_views
non-ChromeOS build.)

         'ffmpeg_branding%': '<(branding)OS',
-      },{  # else chromeos==0, assume Chrome/Chromium.
+      }, {  # otherwise, assume Chrome/Chromium.
         'ffmpeg_branding%': '<(branding)',
       }],
       ['armv7==1 and arm_neon==1', {
         # Need a separate config for arm+neon vs arm
         'ffmpeg_config%': 'arm-neon',
       }, {
         'ffmpeg_config%': '<(target_arch)',
       }],
       ['target_arch=="x64" or target_arch=="ia32"', {
         'ffmpeg_asm_lib': 1,
@@ skipping 744 matching lines @@
       ],  # conditions
     },
   ],  # targets
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: