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

trunk/src/mojo/mojo_public.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_system',
       'type': 'shared_library',
       'defines': [
         'MOJO_SYSTEM_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'sources': [
         'public/c/system/async_waiter.h',
         'public/c/system/core.h',
         'public/c/system/macros.h',
         'public/c/system/system_export.h',
         'public/cpp/system/core.h',
         'public/cpp/system/macros.h',
         'public/system/core_private.cc',
         'public/system/core_private.h',
       ],
       'conditions': [
         ['OS=="mac"', {
           'xcode_settings': {
-            # Make it a loader-path dependent library.
-            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+            # Make it a run-path dependent library.
+            'DYLIB_INSTALL_NAME_BASE': '@rpath',
           },
-          'conditions': [
-            ['mac_breakpad==1', {
-              'variables': {
-                # A real .dSYM is needed for dump_syms to operate on.
-                'mac_real_dsym': 1,
-              },
-            }],
-          ],
+          'direct_dependent_settings': {
+            'xcode_settings': {
+              # Look for run-path dependent libraries in the loader's directory.
+              'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ],
+            },
+          },
         }],
       ],
     },
     {
       'target_name': 'mojo_gles2',
       'type': 'shared_library',
       'defines': [
         'MOJO_GLES2_IMPLEMENTATION',
         'GLES2_USE_MOJO',
       ],
@@ skipping 13 matching lines @@
       },
       'sources': [
         'public/gles2/gles2.h',
         'public/gles2/gles2_export.h',
         'public/gles2/gles2_private.cc',
         'public/gles2/gles2_private.h',
       ],
       'conditions': [
         ['OS=="mac"', {
           'xcode_settings': {
-            # Make it a loader-path dependent library.
-            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+            # Make it a run-path dependent library.
+            'DYLIB_INSTALL_NAME_BASE': '@rpath',
+          },
+          'direct_dependent_settings': {
+            'xcode_settings': {
+              # Look for run-path dependent libraries in the loader's directory.
+              'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ],
+            },
           },
         }],
       ],
     },
     {
       'target_name': 'mojo_test_support',
       'type': 'shared_library',
       'defines': [
         'MOJO_TEST_SUPPORT_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'sources': [
         'public/tests/test_support.h',
         'public/tests/test_support_private.cc',
         'public/tests/test_support_private.h',
         'public/tests/test_support_export.h',
       ],
       'conditions': [
         ['OS=="mac"', {
           'xcode_settings': {
-            # Make it a loader-path dependent library.
-            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+            # Make it a run-path dependent library.
+            'DYLIB_INSTALL_NAME_BASE': '@rpath',
+          },
+          'direct_dependent_settings': {
+            'xcode_settings': {
+              # Look for run-path dependent libraries in the loader's directory.
+              'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ],
+            },
           },
         }],
       ],
     },
     {
       'target_name': 'mojo_public_test_utils',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
@@ skipping 260 matching lines @@
       ],
       'dependencies': [
         'mojo_shell_bindings',
       ],
       'export_dependent_settings': [
         'mojo_shell_bindings',
       ],
     },
   ],
 }