diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 17:05:31 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 17:05:31 +0000 |
| commit | 2e85d47cd990ab6ec0dbf7df044e337e3fd872d1 (patch) | |
| tree | 850e0411e53a7050741e681e2f6180df7dd8ab00 /mojo | |
| parent | a7938c2c4e66de2c8318f386e587bfbee0c5667d (diff) | |
| download | chromium_src-2e85d47cd990ab6ec0dbf7df044e337e3fd872d1.zip chromium_src-2e85d47cd990ab6ec0dbf7df044e337e3fd872d1.tar.gz chromium_src-2e85d47cd990ab6ec0dbf7df044e337e3fd872d1.tar.bz2 | |
Fixup mojo dylibs to support mojo in content
Second try after revert of
https://codereview.chromium.org/211503005/
The isolates failed because libmojo_system.dylib wasn't getting copied.
BUG=
TBR=mark@chromium.org
Review URL: https://codereview.chromium.org/217003003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/mojo_public.gypi | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi index 71eda7b..024e10c 100644 --- a/mojo/mojo_public.gypi +++ b/mojo/mojo_public.gypi @@ -27,15 +27,17 @@ 'conditions': [ ['OS=="mac"', { 'xcode_settings': { - # 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/.', ], - }, + # Make it a loader-path dependent library. + 'DYLIB_INSTALL_NAME_BASE': '@loader_path', }, + 'conditions': [ + ['mac_breakpad==1', { + 'variables': { + # A real .dSYM is needed for dump_syms to operate on. + 'mac_real_dsym': 1, + }, + }], + ], }], ], }, @@ -69,14 +71,8 @@ 'conditions': [ ['OS=="mac"', { 'xcode_settings': { - # 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/.', ], - }, + # Make it a loader-path dependent library. + 'DYLIB_INSTALL_NAME_BASE': '@loader_path', }, }], ], @@ -104,14 +100,8 @@ 'conditions': [ ['OS=="mac"', { 'xcode_settings': { - # 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/.', ], - }, + # Make it a loader-path dependent library. + 'DYLIB_INSTALL_NAME_BASE': '@loader_path', }, }], ], |