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

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index effc1f072c5a5732f73f92b957878dc5d43dd5ba..04f704178250931818a6b0843493a5c2f4bab1e1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -846,6 +846,7 @@
         ['OS=="android" or branding=="Chrome" or chromecast==1', {
           'proprietary_codecs%': 1,
         }, {
+          'ffmpeg_branding%': "Chromium",

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

I thought we were trying to keep ffmpeg_branding local to the media build files.
However, I see there is already a reference to it in this file (line 1899), so
maybe not. +dalecurtis@ for his opinion.

[DaleCurtis, 2016/01/11 22:13:46]

That's a bug but may be something we end up needing to do here.

           'proprietary_codecs%': 0,
         }],
 
@@ -1253,6 +1254,7 @@
     'enable_service_discovery%' : '<(enable_service_discovery)',
     'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)',
     'proprietary_codecs%': '<(proprietary_codecs)',
+    'ffmpeg_branding%': '<(ffmpeg_branding)',
     'use_goma%': '<(use_goma)',
     'gomadir%': '<(gomadir)',
     'use_lto%': '<(use_lto)',
@@ -1856,6 +1858,7 @@
         'use_openssl_certs%': 1,
 
         'proprietary_codecs%': '<(proprietary_codecs)',
+        'ffmpeg_branding%': '<(ffmpeg_branding)',
 
         'safe_browsing%': 2,