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

Unified Diff: util/util.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
« third_party/gmock/gmock.gyp ('K') | « tools/tools.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: util/util.gyp
diff --git a/util/util.gyp b/util/util.gyp
index ac7fc477339fcc07e013e3a29c897a8cdee838b2..e2dc860cadaf4948b77797ae30a445c45567100e 100644
--- a/util/util.gyp
+++ b/util/util.gyp
@@ -22,7 +22,7 @@
'type': 'static_library',
'dependencies': [
'../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': [
'..',
@@ -213,10 +213,10 @@
'target_name': 'crashpad_util_test_lib',
'type': 'static_library',
'dependencies': [
+ 'crashpad_util',
'../compat/compat.gyp:crashpad_compat',
'../third_party/gtest/gtest.gyp:gtest',
- '../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
- 'crashpad_util',
+ '../third_party/mini_chromium/mini_chromium.gyp:base',
],
'include_dirs': [
'..',
@@ -261,9 +261,9 @@
'crashpad_util_test_multiprocess_exec_test_child',
'../compat/compat.gyp:crashpad_compat',
'../third_party/gmock/gmock.gyp:gmock',
+ '../third_party/gmock/gmock.gyp:gmock_main',
'../third_party/gtest/gtest.gyp:gtest',
- '../third_party/gtest/gtest.gyp:gtest_main',
- '../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
+ '../third_party/mini_chromium/mini_chromium.gyp:base',
],
'include_dirs': [
'..',
« third_party/gmock/gmock.gyp ('K') | « tools/tools.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698