diff options
| author | pmonette <pmonette@chromium.org> | 2016-01-07 16:21:16 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-08 00:22:31 +0000 |
| commit | 502a83e013988cb8202844650e0e423ec2d8ee78 (patch) | |
| tree | bec66a12ca8a6b9edd9a657431db9e1f94ba7adf /chrome/chrome_browser.gypi | |
| parent | ab0c1304c9f3b0c248f154680db5449f1a5497c8 (diff) | |
| download | chromium_src-502a83e013988cb8202844650e0e423ec2d8ee78.zip chromium_src-502a83e013988cb8202844650e0e423ec2d8ee78.tar.gz chromium_src-502a83e013988cb8202844650e0e423ec2d8ee78.tar.bz2 | |
Switched Kasko to use the new buildflag system.
Moved gyp build to third_party/kasko
Also fixed some build issues that came with rebasing to tip of tree.
Review URL: https://codereview.chromium.org/1526213002
Cr-Commit-Position: refs/heads/master@{#368212}
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index c402751..6063186 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3816,24 +3816,18 @@ '../google_update/google_update.gyp:google_update', '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', '../third_party/isimpledom/isimpledom.gyp:isimpledom', + '../third_party/kasko/kasko.gyp:kasko', '../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', '../ui/views/controls/webview/webview.gyp:webview', '../ui/views/views.gyp:views', '../win8/win8.gyp:metro_viewer', ], 'export_dependent_settings': [ + '../third_party/kasko/kasko.gyp:kasko', '../ui/views/controls/webview/webview.gyp:webview', '../ui/views/views.gyp:views', ], 'conditions': [ - ['kasko==1', { - 'dependencies': [ - 'kasko_dll', - ], - 'export_dependent_settings': [ - 'kasko_dll', - ], - }], ['branding!="Chrome"', { 'dependencies!': [ '../google_update/google_update.gyp:google_update', |