Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Unified Diff: mojo/mojo_public.gypi

Issue 211503005: Fixup mojo dylibs to support mojo in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add isolate support Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_public.gypi
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 2bb9057e46ee32ac16c19f7db12c80ed8d5fff17..9d122b0781aa27819efa33925f806675326ed518 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -26,15 +26,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,
+ },
+ }],
+ ],
}],
],
},
@@ -68,14 +70,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',
},
}],
],
@@ -103,14 +99,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',
},
}],
],
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698