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

Side by Side Diff: chrome/chrome_watcher/chrome_watcher.gypi

Issue 2086403002: Remove the Kasko based out of process browser hang instrumentation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « chrome/chrome_watcher/BUILD.gn ('k') | chrome/chrome_watcher/chrome_watcher_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'includes': [ 8 'includes': [
9 '../../build/util/version.gypi', 9 '../../build/util/version.gypi',
10 '../../build/win_precompile.gypi', 10 '../../build/win_precompile.gypi',
11 ], 11 ],
12 'conditions': [ 12 'targets': [
13 ['kasko==1', { 13 {
14 'targets': [ 14 'target_name': 'kasko_util',
15 { 15 'type': 'none',
16 'target_name': 'kasko_util', 16 'dependencies': [
17 'type': 'static_library', 17 '../third_party/kasko/kasko.gyp:kasko_features',
18 'sources': [ 18 ],
19 'kasko_util.cc', 19 },
20 'kasko_util.h', 20 {
21 'system_load_estimator.cc', 21 'target_name': 'hang_util',
22 'system_load_estimator.h', 22 'type': 'static_library',
23 'sources': [
24 'system_load_estimator.cc',
25 'system_load_estimator.h',
26 ],
27 'dependencies': [
28 '../base/base.gyp:base',
29 '../components/components.gyp:memory_pressure'
30 ],
31 'msvs_settings': {
32 'VCLinkerTool': {
33 'DelayLoadDLLs': [
34 'pdh.dll', # Used by system_load_estimator.h on report capture.
23 ], 35 ],
24 'dependencies': [ 36 'AdditionalDependencies': [
25 'chrome_watcher_client', 37 'pdh.lib',
26 '../base/base.gyp:base',
27 '../third_party/kasko/kasko.gyp:kasko',
28 '../components/components.gyp:crash_component',
29 '../components/components.gyp:memory_pressure'
30 ], 38 ],
31 'export_dependent_settings': [ 39 },
32 '../third_party/kasko/kasko.gyp:kasko', 40 },
33 ], 41 'all_dependent_settings': {
34 'msvs_settings': { 42 'msvs_settings': {
35 'VCLinkerTool': { 43 'VCLinkerTool': {
36 'DelayLoadDLLs': [ 44 'DelayLoadDLLs': [
37 'pdh.dll', # Used by system_load_estimator.h on report capture. 45 # Used by system_load_estimator.h on report capture.
38 ], 46 'pdh.dll',
39 'AdditionalDependencies': [ 47 ],
40 'pdh.lib', 48 'AdditionalDependencies': [
41 ], 49 'pdh.lib',
42 }, 50 ],
43 },
44 'all_dependent_settings': {
45 'msvs_settings': {
46 'VCLinkerTool': {
47 'DelayLoadDLLs': [
48 # Used by system_load_estimator.h on report capture.
49 'pdh.dll',
50 ],
51 'AdditionalDependencies': [
52 'pdh.lib',
53 ],
54 },
55 },
56 }, 51 },
57 }, 52 },
58 53 },
59 { 54 },
60 # GN version: //chrome/chrome_watcher:system_load_estimator_unittests 55 {
61 'target_name': 'system_load_estimator_unittests', 56 # GN version: //chrome/chrome_watcher:system_load_estimator_unittests
62 'type': '<(gtest_target_type)', 57 'target_name': 'system_load_estimator_unittests',
63 'sources': [ 58 'type': '<(gtest_target_type)',
64 'system_load_estimator_unittest.cc', 59 'sources': [
65 ], 60 'system_load_estimator_unittest.cc',
66 'dependencies': [
67 'kasko_util',
68 '../base/base.gyp:base',
69 '../base/base.gyp:run_all_unittests',
70 '../base/base.gyp:test_support_base',
71 '../testing/gtest.gyp:gtest',
72 ],
73 },
74 ], 61 ],
75 }, { # 'kasko==0' 62 'dependencies': [
76 'targets': [ 63 'hang_util',
77 { 64 '../base/base.gyp:base',
78 'target_name': 'kasko_util', 65 '../base/base.gyp:run_all_unittests',
79 'type': 'none', 66 '../base/base.gyp:test_support_base',
80 'dependencies': [ 67 '../testing/gtest.gyp:gtest',
81 '../third_party/kasko/kasko.gyp:kasko_features',
82 ],
83 },
84 ], 68 ],
85 }], 69 },
86 ], # 'conditions'
87 'targets': [
88 { 70 {
89 'target_name': 'chrome_watcher_resources', 71 'target_name': 'chrome_watcher_resources',
90 'type': 'none', 72 'type': 'none',
91 'conditions': [ 73 'conditions': [
92 ['branding == "Chrome"', { 74 ['branding == "Chrome"', {
93 'variables': { 75 'variables': {
94 'branding_path': '../app/theme/google_chrome/BRANDING', 76 'branding_path': '../app/theme/google_chrome/BRANDING',
95 }, 77 },
96 }, { # else branding!="Chrome" 78 }, { # else branding!="Chrome"
97 'variables': { 79 'variables': {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 ], 125 ],
144 'msvs_settings': { 126 'msvs_settings': {
145 'VCLinkerTool': { 127 'VCLinkerTool': {
146 # Set /SUBSYSTEM:WINDOWS. 128 # Set /SUBSYSTEM:WINDOWS.
147 'SubSystem': '2', 129 'SubSystem': '2',
148 }, 130 },
149 }, 131 },
150 }, 132 },
151 ], 133 ],
152 } 134 }
OLDNEW
« no previous file with comments | « chrome/chrome_watcher/BUILD.gn ('k') | chrome/chrome_watcher/chrome_watcher_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698