FFmpeg in-tree build for mac.

chrome/chrome.gyp

 # Copyright (c) 2009 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,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 5858 matching lines @@
                   ],
                   'conditions': [
                     ['mac_breakpad==1', {
                       'files': [
                         '<(PRODUCT_DIR)/crash_inspector',
                         '<(PRODUCT_DIR)/crash_report_sender.app'
                       ],
                     }],
                   ],
                 },
+                {
+                  'destination':
+                      '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
+                  'files': [
+                    # TODO(ajwong): Find a way to share this path with
+                    # ffmpeg.gyp so they don't diverge. (BUG=23602)
+                    '<(PRODUCT_DIR)/libffmpegsumo.dylib',
+                  ],
+                },
               ],
               'conditions': [
                 ['mac_breakpad==1', {
                   'variables': {
                     # A real .dSYM is needed for dump_syms to operate on.
                     'mac_real_dsym': 1,
                   },
                   'sources': [
                     'app/breakpad_mac.mm',
                     'app/breakpad_mac.h',
@@ skipping 22 matching lines @@
                       'postbuild_name': 'Symlink Frameworks',
                       'action': [
                         'ln',
                         '-fhs',
                         'Versions/Current/Frameworks',
                         '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Frameworks'
                       ],
                     },
                   ],
                 }],  # mac_keystone
-                ['branding=="Chrome"', {
-                  'copies': [
-                    {
-                      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
-                      # TODO(ajwong): This, and the parallel chromium stanza
-                      # below really should find a way to share file paths with
-                      # ffmpeg.gyp so they don't diverge. (BUG=23602)
-                      'files': [
-                        '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavcodec.52.dylib',
-                        '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavformat.52.dylib',
-                        '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavutil.50.dylib',
-                      ],
-                    },
-                  ],
-                }, {  # else: 'branding!="Chrome"
-                  'copies': [
-                    {
-                      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
-                      'files': [
-                        '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavcodec.52.dylib',
-                        '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavformat.52.dylib',
-                        '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavutil.50.dylib',
-                      ],
-                    },
-                  ],
-                }],  # branding
               ],  # conditions
             }],  # OS=="mac"
           ],  # conditions
         },  # target chrome_dll
       ],  # targets
     }],  # OS=="mac" or OS=="win"
     ['OS=="mac"',
       { 'targets': [
         {
           'target_name': 'helper_app',
@@ skipping 1019 matching lines @@
       ]
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: