Revert 260175 "Fixup mojo dylibs to support mojo in content"

trunk/src/content/content_shell.gypi

 # 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': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
@@ skipping 831 matching lines @@
               # doesn't currently use the SCM keys for anything,
               # but this seems like a really good place to store them.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['../build/mac/tweak_info_plist.py',
                          '--breakpad=1',
                          '--keystone=0',
                          '--scm=1',
                          '--version=<(content_shell_version)',
                          '--branding=<(content_shell_product_name)'],
             },
-            {
-              # Copy libmojo_system.dylib explicitly. The copies section does a
-              # hard link, and since we modify it we would end up with the wrong
-              # load command in things linked afterward.
-              'postbuild_name': 'Copy libmojo_system.dylib',
-              'action': ['cp',
-                         '-p',
-                         '${BUILT_PRODUCTS_DIR}/libmojo_system.dylib',
-                         '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries'],
-            },
-            {
-              # Changes the id of libmojo_system.dylib to come from the
-              # Libraries folder to be consistent with the load command.
-              'postbuild_name': 'Update id of libmojo_system.dylib',
-              'action': ['install_name_tool',
-                         '-id',
-                         '@loader_path/Libraries/libmojo_system.dylib',
-                         '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries/libmojo_system.dylib'],
-            },
-            {
-              # Changes the load command of libmojo_system.dylib to come from
-              # the Libraries folder.
-              'postbuild_name': 'Update load of libmojo_system.dylib',
-              'action': ['install_name_tool',
-                         '-change',
-                         '@loader_path/libmojo_system.dylib',
-                         '@loader_path/Libraries/libmojo_system.dylib',
-                         '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'],
-            },
           ],
           'copies': [
             {
-              # Copy FFmpeg for audio/video support and mojo.
+              # Copy FFmpeg binaries for audio/video support.
               'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
               'files': [
                 '<(PRODUCT_DIR)/ffmpegsumo.so',
               ],
             },
             {
               'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
               'files': [
                 '<(PRODUCT_DIR)/crash_inspector',
                 '<(PRODUCT_DIR)/crash_report_sender.app'
@@ skipping 267 matching lines @@
                 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
                 '--destination_dir', '<(dest_dir)',
               ],
             },
           ],
         },
       ],
     }],  # OS=="win" and fastbuild==0 and target_arch=="ia32"
   ]
 }