Raise gyp/GN failure if proprietary_codecs=1 and ffmpeg_branding=Chromium

media/media.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 1115 matching lines @@
             'formats/mp4/hevc.cc',
             'formats/mp4/hevc.h',
           ],
         }],
         ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg==1', {
           'sources': [
             'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
             'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
           ],
         }],
+        ['proprietary_codecs==1 and media_use_ffmpeg==1 and ffmpeg_branding=="Chromium"', {
+          'fail%': "<!(echo proprietary codecs and ffmpeg_branding set to Chromium are incompatible; exit 1)>",

[jrummell, 2016/01/11 22:05:47]

Not sure if fail needs to be a variable. 'fail' also seems to work, but I guess
it doesn't make any difference.

+        }],
         ['target_arch=="ia32" or target_arch=="x64"', {
           'dependencies': [
             'media_asm',
           ],
           'sources': [
             'base/simd/convert_rgb_to_yuv_sse2.cc',
             'base/simd/convert_rgb_to_yuv_ssse3.cc',
             'base/simd/convert_yuv_to_rgb_x86.cc',
             'base/simd/filter_yuv_sse2.cc',
           ],
@@ skipping 1017 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }