Chromium Code Reviews| Index: chrome/common/extensions/api/feature.gyp |
| diff --git a/chrome/browser/performance_monitor/performance_monitor.gyp b/chrome/common/extensions/api/feature.gyp |
| similarity index 54% |
| copy from chrome/browser/performance_monitor/performance_monitor.gyp |
| copy to chrome/common/extensions/api/feature.gyp |
| index e3587f491e845a154ccfdf40e36df6e501b2d2d8..8eb3b21a3a87ca6af4467ba7915db901ee9d730d 100644 |
| --- a/chrome/browser/performance_monitor/performance_monitor.gyp |
| +++ b/chrome/common/extensions/api/feature.gyp |
| @@ -1,26 +1,24 @@ |
| -# Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| +# Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| - |
| { |
| 'targets': [ |
| { |
| - 'target_name': 'performance_monitor', |
| + 'target_name': 'feature', |
|
not at google - send to devlin
2013/09/12 16:20:43
it's simpler to just put this in with api.gyp with
dhnishi (use Chromium)
2013/09/13 17:36:42
Done. File removed and modified the api.gyp file i
|
| 'type': 'static_library', |
| 'sources': [ |
| '<@(schema_files)', |
| ], |
| 'includes': [ |
| - '../../../build/json_schema_compile.gypi', |
| + '../../../../build/features_compile.gypi', |
| ], |
| 'variables': { |
| 'chromium_code': 1, |
| 'schema_files': [ |
| - 'events.json', |
| + '_permission_features.json', |
| ], |
| - 'cc_dir': 'chrome/browser/performance_monitor', |
| - 'root_namespace': 'performance_monitor', |
| + 'cc_dir': 'chrome/common/extensions/api', |
| }, |
| }, |
| ], |
| -} |
| +} |