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

Unified Diff: base/allocator/allocator.gyp

Issue 1414453017: Allocator shims working on VS2015. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/allocator/BUILD.gn ('k') | base/allocator/allocator_check.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/allocator/allocator.gyp
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index d906eea0aace26f3f61e56a1331f5f7730d38642..8d241d1b8983bc2acf9ab1041cafdf36d012871a 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -49,25 +49,13 @@
'AdditionalOptions': ['/ignore:4006'],
},
},
- 'dependencies': [
- 'libcmt',
- ],
'include_dirs': [
'../..',
],
'sources': [
'allocator_shim_win.cc',
+ 'allocator_shim_win.h',
],
- 'link_settings': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
- 'AdditionalDependencies': [
- '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib'
- ],
- },
- },
- },
'configurations': {
'Debug_Base': {
'msvs_settings': {
@@ -393,33 +381,6 @@
}, # 'allocator_features' target.
], # targets.
'conditions': [
- ['OS=="win" and win_use_allocator_shim==1', {
- 'targets': [
- {
- 'target_name': 'libcmt',
- 'toolsets': ['host', 'target'],
- 'type': 'none',
- 'actions': [
- {
- 'action_name': 'libcmt',
- 'inputs': [
- 'prep_libc.py',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib',
- ],
- 'action': [
- 'python',
- 'prep_libc.py',
- '$(VCInstallDir)lib',
- '<(SHARED_INTERMEDIATE_DIR)/allocator',
- '<(target_arch)',
- ],
- },
- ],
- },
- ],
- }],
['use_experimental_allocator_shim==1', {
'targets': [
{
« no previous file with comments | « base/allocator/BUILD.gn ('k') | base/allocator/allocator_check.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698