Revert 49991 - Only copy libffmpegsumo if build_libffmpegsumo is 1....

chrome/chrome_dll.gypi

 # 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.
 {
   'target_defaults': {
     'variables': {
       'chrome_dll_target': 0,
     },
     'target_conditions': [
       ['chrome_dll_target==1', {
@@ skipping 439 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',
+                  ],
+                },
+                {
                   'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins',
                   'files': [],
                   'conditions': [
                     [ 'branding == "Chrome"', {
                       'files': [
                         '<(PRODUCT_DIR)/Flash Player Plugin for Chrome.plugin',
                         '<(PRODUCT_DIR)/plugin.vch',
                       ],
                     }],
                     ['internal_pdf', {
@@ skipping 46 matching lines @@
                         'Versions/Current/Frameworks',
                         '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Frameworks'
                       ],
                     },
                   ],
                 }],  # mac_keystone
                 ['internal_pdf', {
                   'dependencies': [
                     '../pdf/pdf.gyp:pdf',
                   ],
-                }],  # internal_pdf
-                ['build_ffmpegsumo', {
-                  'copies': [
-                    {
-                      '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',
-                      ],
-                    },
-                  ],
-                }],  # build_ffmpegsumo
+                }],
               ],  # conditions
             }],  # OS=="mac"
           ],  # conditions
         },  # target chrome_dll
       ],  # targets
     }],  # OS=="mac" or OS=="win"
     [ 'OS=="win"', {
       'targets': [
         {
           'target_name': 'chrome_dll_nacl_win64',
@@ skipping 47 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },  # target chrome_dll
       ],
     }],
   ],
 }