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

Unified Diff: third_party/crashpad/crashpad/handler/handler.gyp

Issue 2705373005: Revert of Update Crashpad to 6da9708e7cc93e2e1772439d51646e47583cb225 (Closed)
Patch Set: Created 3 years, 10 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
Index: third_party/crashpad/crashpad/handler/handler.gyp
diff --git a/third_party/crashpad/crashpad/handler/handler.gyp b/third_party/crashpad/crashpad/handler/handler.gyp
index 6a51222cff67892d4c601a800b5431af13d47498..e2d993df238f86ddfcaf8a2a9cdd0a8ce00f2e79 100644
--- a/third_party/crashpad/crashpad/handler/handler.gyp
+++ b/third_party/crashpad/crashpad/handler/handler.gyp
@@ -15,6 +15,7 @@
{
'includes': [
'../build/crashpad.gypi',
+ '../build/crashpad_dependencies.gypi',
],
'targets': [
{
@@ -65,6 +66,29 @@
],
'conditions': [
+ ['OS=="mac"', {
+ # In an in-Chromium build with component=shared_library,
+ # crashpad_handler will depend on shared libraries such as
+ # libbase.dylib located in out/{Debug,Release} via the @rpath
+ # mechanism. When crashpad_handler is copied to its home deep inside
+ # the Chromium app bundle, it needs to have an LC_RPATH command
+ # pointing back to the directory containing these dependency
+ # libraries.
+ 'variables': {
+ 'component%': 'static_library',
+ },
+ 'conditions': [
+ ['crashpad_dependencies=="chromium" and component=="shared_library"', {
+ 'xcode_settings': {
+ 'LD_RUNPATH_SEARCH_PATHS': [ # -Wl,-rpath
+ # Get back from
+ # Chromium.app/Contents/Versions/V/Framework.framework/Helpers
+ '@loader_path/../../../../../..',
+ ],
+ },
+ }],
+ ],
+ }],
['OS=="win"', {
'msvs_settings': {
'VCLinkerTool': {
« no previous file with comments | « third_party/crashpad/crashpad/handler/crashpad_handler.md ('k') | third_party/crashpad/crashpad/handler/handler_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698