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

trunk/src/chrome/chrome_dll_bundle.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.
 
 # This file contains resources for the main Mac chromium bundle.
 {
   # The main browser executable's name is <(mac_product_name).
   # Certain things will get confused if two modules in the
   # executable share the same name, so append " Framework" to the
   # product_name used for the framework.  This will result in
@@ skipping 110 matching lines @@
       # but this seems like a really good place to store them.
       'postbuild_name': 'Tweak Info.plist',
       'action': ['<(tweak_info_plist_path)',
                  '--breakpad=<(mac_breakpad_compiled_in)',
                  '--breakpad_uploads=<(mac_breakpad_uploads)',
                  '--keystone=0',
                  '--scm=1',
                  '--branding=<(branding)'],
     },
     {
-      # 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}'],
-    },
-    {
       'postbuild_name': 'Symlink Libraries',
       'action': [
         'ln',
         '-fns',
         'Versions/Current/Libraries',
         '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries'
       ],
     },
   ],
   'copies': [
     {
-      # Copy FFmpeg binaries 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)/Internet Plug-Ins',
       'files': [],
       'conditions': [
         ['internal_pdf', {
@@ skipping 155 matching lines @@
         ],
       }],
     }],
     ['icu_use_data_file_flag==1', {
       'mac_bundle_resources': [
         '<(PRODUCT_DIR)/icudtl.dat',
       ],
     }],
   ],  # conditions
 }