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

Unified Diff: third_party/crashpad/crashpad/third_party/mini_chromium/mini_chromium.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/third_party/mini_chromium/mini_chromium.gyp
diff --git a/third_party/crashpad/crashpad/third_party/mini_chromium/mini_chromium.gyp b/third_party/crashpad/crashpad/third_party/mini_chromium/mini_chromium.gyp
index e14a1fa5ca977a1994f9bc6bc08af8a08810ee0e..f063dd0a7232ab747650ee6247cfad386c5b6ea1 100644
--- a/third_party/crashpad/crashpad/third_party/mini_chromium/mini_chromium.gyp
+++ b/third_party/crashpad/crashpad/third_party/mini_chromium/mini_chromium.gyp
@@ -18,10 +18,11 @@
],
'targets': [
{
- # To support Crashpad’s standalone build and its build depending on
- # external libraries, Crashpad code depending on base should do so through
- # this shim, which will either get base from mini_chromium or an external
- # library depending on the build type.
+ # To support Crashpad’s standalone build, its in-Chromium build, and its
+ # build depending on external libraries, Crashpad code depending on base
+ # should do so through this shim, which will either get base from
+ # mini_chromium, Chromium, or an external library depending on the build
+ # type.
'target_name': 'base',
'type': 'none',
'conditions': [
@@ -33,6 +34,14 @@
'mini_chromium/base/base.gyp:base',
],
}],
+ ['crashpad_dependencies=="chromium"', {
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
+ ],
+ 'export_dependent_settings': [
+ '<(DEPTH)/base/base.gyp:base',
+ ],
+ }],
['crashpad_dependencies=="external"', {
'dependencies': [
'../../../../mini_chromium/mini_chromium/base/base.gyp:base',

Powered by Google App Engine
This is Rietveld 408576698