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

Unified Diff: tools/tools.gyp

Issue 986033002: Allow Crashpad to build in the Chromium tree (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Rewrap Created 5 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
Index: tools/tools.gyp
diff --git a/tools/tools.gyp b/tools/tools.gyp
index b0981f5f3309e4191b0f0b74c20cd8029b18bcf5..404c5eb70c9385a1481d163513635f09cf30ad3f 100644
--- a/tools/tools.gyp
+++ b/tools/tools.gyp
@@ -37,8 +37,7 @@
# .xcodeproj, which is the directory of the .gyp file.
'conditions': [
['GENERATOR=="ninja"', {
- 'sectaskaccess_info_plist':
- '../../tools/mac/sectaskaccess_info.plist',
+ 'sectaskaccess_info_plist': '<!(pwd)/mac/sectaskaccess_info.plist',
}, { # else: GENERATOR!="ninja"
'sectaskaccess_info_plist': 'mac/sectaskaccess_info.plist',
}],
@@ -50,7 +49,7 @@
'target_name': 'crashpad_tool_support',
'type': 'static_library',
'dependencies': [
- '../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
+ '../third_party/mini_chromium/mini_chromium.gyp:base',
],
'include_dirs': [
'..',
@@ -66,7 +65,7 @@
'dependencies': [
'crashpad_tool_support',
'../compat/compat.gyp:crashpad_compat',
- '../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
+ '../third_party/mini_chromium/mini_chromium.gyp:base',
'../util/util.gyp:crashpad_util',
],
'include_dirs': [
@@ -82,7 +81,7 @@
'dependencies': [
'crashpad_tool_support',
'../compat/compat.gyp:crashpad_compat',
- '../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
+ '../third_party/mini_chromium/mini_chromium.gyp:base',
'../util/util.gyp:crashpad_util',
],
'include_dirs': [
@@ -108,7 +107,7 @@
'../compat/compat.gyp:crashpad_compat',
'../minidump/minidump.gyp:crashpad_minidump',
'../snapshot/snapshot.gyp:crashpad_snapshot',
- '../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
+ '../third_party/mini_chromium/mini_chromium.gyp:base',
'../util/util.gyp:crashpad_util',
],
'include_dirs': [
@@ -132,7 +131,7 @@
'dependencies': [
'crashpad_tool_support',
'../compat/compat.gyp:crashpad_compat',
- '../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
+ '../third_party/mini_chromium/mini_chromium.gyp:base',
'../util/util.gyp:crashpad_util',
],
'include_dirs': [
@@ -155,7 +154,7 @@
'crashpad_tool_support',
'../client/client.gyp:crashpad_client',
'../compat/compat.gyp:crashpad_compat',
- '../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
+ '../third_party/mini_chromium/mini_chromium.gyp:base',
],
'include_dirs': [
'..',

Powered by Google App Engine
This is Rietveld 408576698