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

trunk/src/mojo/mojo_public.gypi

Index: trunk/src/mojo/mojo_public.gypi
===================================================================
--- trunk/src/mojo/mojo_public.gypi	(revision 260180)
+++ trunk/src/mojo/mojo_public.gypi	(working copy)
@@ -27,17 +27,15 @@
       '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/.', ],
+            },
+          },
         }],
       ],
     },
@@ -71,9 +69,15 @@
       '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/.', ],
+            },
+          },
         }],
       ],
     },
@@ -100,9 +104,15 @@
       '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/.', ],
+            },
+          },
         }],
       ],
     },