| Index: chrome/chrome_watcher/chrome_watcher.gypi
|
| diff --git a/chrome/chrome_watcher/chrome_watcher.gypi b/chrome/chrome_watcher/chrome_watcher.gypi
|
| index e0d90e6e94e52ecc210a2b202b9e9e1daa2fc01f..a5357ad6208546df39c4c64a89b3fef61517fcf4 100644
|
| --- a/chrome/chrome_watcher/chrome_watcher.gypi
|
| +++ b/chrome/chrome_watcher/chrome_watcher.gypi
|
| @@ -9,82 +9,64 @@
|
| '../../build/util/version.gypi',
|
| '../../build/win_precompile.gypi',
|
| ],
|
| - 'conditions': [
|
| - ['kasko==1', {
|
| - 'targets': [
|
| - {
|
| - 'target_name': 'kasko_util',
|
| - 'type': 'static_library',
|
| - 'sources': [
|
| - 'kasko_util.cc',
|
| - 'kasko_util.h',
|
| - 'system_load_estimator.cc',
|
| - 'system_load_estimator.h',
|
| - ],
|
| - 'dependencies': [
|
| - 'chrome_watcher_client',
|
| - '../base/base.gyp:base',
|
| - '../third_party/kasko/kasko.gyp:kasko',
|
| - '../components/components.gyp:crash_component',
|
| - '../components/components.gyp:memory_pressure'
|
| + 'targets': [
|
| + {
|
| + 'target_name': 'kasko_util',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + '../third_party/kasko/kasko.gyp:kasko_features',
|
| + ],
|
| + },
|
| + {
|
| + 'target_name': 'hang_util',
|
| + 'type': 'static_library',
|
| + 'sources': [
|
| + 'system_load_estimator.cc',
|
| + 'system_load_estimator.h',
|
| + ],
|
| + 'dependencies': [
|
| + '../base/base.gyp:base',
|
| + '../components/components.gyp:memory_pressure'
|
| + ],
|
| + 'msvs_settings': {
|
| + 'VCLinkerTool': {
|
| + 'DelayLoadDLLs': [
|
| + 'pdh.dll', # Used by system_load_estimator.h on report capture.
|
| ],
|
| - 'export_dependent_settings': [
|
| - '../third_party/kasko/kasko.gyp:kasko',
|
| + 'AdditionalDependencies': [
|
| + 'pdh.lib',
|
| ],
|
| - 'msvs_settings': {
|
| - 'VCLinkerTool': {
|
| - 'DelayLoadDLLs': [
|
| - 'pdh.dll', # Used by system_load_estimator.h on report capture.
|
| - ],
|
| - 'AdditionalDependencies': [
|
| - 'pdh.lib',
|
| - ],
|
| - },
|
| - },
|
| - 'all_dependent_settings': {
|
| - 'msvs_settings': {
|
| - 'VCLinkerTool': {
|
| - 'DelayLoadDLLs': [
|
| - # Used by system_load_estimator.h on report capture.
|
| - 'pdh.dll',
|
| - ],
|
| - 'AdditionalDependencies': [
|
| - 'pdh.lib',
|
| - ],
|
| - },
|
| - },
|
| - },
|
| },
|
| -
|
| - {
|
| - # GN version: //chrome/chrome_watcher:system_load_estimator_unittests
|
| - 'target_name': 'system_load_estimator_unittests',
|
| - 'type': '<(gtest_target_type)',
|
| - 'sources': [
|
| - 'system_load_estimator_unittest.cc',
|
| - ],
|
| - 'dependencies': [
|
| - 'kasko_util',
|
| - '../base/base.gyp:base',
|
| - '../base/base.gyp:run_all_unittests',
|
| - '../base/base.gyp:test_support_base',
|
| - '../testing/gtest.gyp:gtest',
|
| - ],
|
| + },
|
| + 'all_dependent_settings': {
|
| + 'msvs_settings': {
|
| + 'VCLinkerTool': {
|
| + 'DelayLoadDLLs': [
|
| + # Used by system_load_estimator.h on report capture.
|
| + 'pdh.dll',
|
| + ],
|
| + 'AdditionalDependencies': [
|
| + 'pdh.lib',
|
| + ],
|
| + },
|
| },
|
| + },
|
| + },
|
| + {
|
| + # GN version: //chrome/chrome_watcher:system_load_estimator_unittests
|
| + 'target_name': 'system_load_estimator_unittests',
|
| + 'type': '<(gtest_target_type)',
|
| + 'sources': [
|
| + 'system_load_estimator_unittest.cc',
|
| ],
|
| - }, { # 'kasko==0'
|
| - 'targets': [
|
| - {
|
| - 'target_name': 'kasko_util',
|
| - 'type': 'none',
|
| - 'dependencies': [
|
| - '../third_party/kasko/kasko.gyp:kasko_features',
|
| - ],
|
| - },
|
| + 'dependencies': [
|
| + 'hang_util',
|
| + '../base/base.gyp:base',
|
| + '../base/base.gyp:run_all_unittests',
|
| + '../base/base.gyp:test_support_base',
|
| + '../testing/gtest.gyp:gtest',
|
| ],
|
| - }],
|
| - ], # 'conditions'
|
| - 'targets': [
|
| + },
|
| {
|
| 'target_name': 'chrome_watcher_resources',
|
| 'type': 'none',
|
|
|