Add build_ffmpegsumo GYP variable that controls whether libffmpegsumo is built.

This replicates the old behaviour of use_system_ffmpeg, where Chromium is built against the patched set of FFmpeg headers, but relies on the system or user to provide FFmpeg binaires at run time.

BUG=39430
TEST=build_ffmpegsumo=0 should result in libffmpegsumo.so not getting built

Review URL: http://codereview.chromium.org/1569006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43240 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 22 insertions, 3 deletions

diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 40873e8..c6887c5 100644
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -2,6 +2,20 @@
 # 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
+#     When set to non-zero will build Chromium against the system FFmpeg
+#     headers via pkg-config.  When Chromium is launched it will assume that
+#     FFmpeg is present in the system library path.  Default value is 0.
+#   build_ffmpegsumo
+#     When set to zero will build Chromium against the patched ffmpegsumo
+#     headers, but not build ffmpegsumo itself.  Users are expected to build
+#     and provide their own version of ffmpegsumo.  Default value is 1.
+
 # TODO(ajwong): Determine if we want to statically link libz.
 
 {
@@ -49,13 +63,14 @@
 
     'use_system_ffmpeg%': 0,
     'use_system_yasm%': 0,
+    'build_ffmpegsumo%': 1,
 
     # Locations for generated artifacts.
     'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/ffmpeg',
     'asm_library': 'ffmpegasm',
   },
   'conditions': [
-    ['OS!="win" and use_system_ffmpeg==0', {
+    ['OS!="win" and use_system_ffmpeg==0 and build_ffmpegsumo!=0', {
       'targets': [
         {
           'target_name': 'ffmpegsumo',
@@ -767,8 +782,12 @@
                   'source/patched-ffmpeg-mt',
                 ],
               },
-              'dependencies': [
-                'ffmpegsumo_nolink',
+              'conditions': [
+                ['build_ffmpegsumo!=0', {
+                  'dependencies': [
+                    'ffmpegsumo_nolink',
+                  ],
+                }],
               ],
             }],
           ],  # conditions