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.gyp | |
| 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.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 6694fb5..6beaddd 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -773,41 +773,5 @@ }, ], }], - ['kasko==1', { - 'variables': { - 'kasko_exe_dir': '<(DEPTH)/third_party/kasko/binaries', - }, - 'targets': [ - { - 'target_name': 'kasko_dll', - 'type': 'none', - 'outputs': [ - '<(PRODUCT_DIR)/kasko.dll', - '<(PRODUCT_DIR)/kasko.dll.pdb', - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<(kasko_exe_dir)/kasko.dll', - '<(kasko_exe_dir)/kasko.dll.pdb', - ], - }, - ], - 'direct_dependent_settings': { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'kasko.dll.lib', - ], - 'AdditionalLibraryDirectories': [ - '<(DEPTH)/third_party/kasko/binaries' - ], - }, - }, - }, - }, - ], - }], ], # 'conditions' } |