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

Unified Diff: base/allocator/allocator.gyp

Issue 1610673002: Revert of Allow base to depend on allocator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/base.gyp » ('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 428d68de5842b3d03ff3fa77113756033f36e45a..45a95bbdc2669a0dafdd9fa9caaf0f050d7b921b 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -31,7 +31,6 @@
# static lib can confuse some gyp generators). Fix it once the refactoring
# (crbug.com/564618) bring this file to a saner state (fewer conditions).
'type': 'static_library',
- 'toolsets': ['host', 'target'],
'conditions': [
['OS=="win" and win_use_allocator_shim==1', {
'msvs_settings': {
@@ -52,21 +51,25 @@
'sources': [
'allocator_shim_win.cc',
],
- 'link_settings': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
- 'AdditionalDependencies': [
- '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib'
- ],
- },
- },
- },
'configurations': {
'Debug_Base': {
'msvs_settings': {
'VCCLCompilerTool': {
'RuntimeLibrary': '0',
+ },
+ },
+ },
+ },
+ 'direct_dependent_settings': {
+ 'configurations': {
+ 'Common_Base': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
+ 'AdditionalDependencies': [
+ '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib'
+ ],
+ },
},
},
},
@@ -369,7 +372,7 @@
}, # 'allocator' target.
], # targets.
'conditions': [
- ['OS=="win" and win_use_allocator_shim==1', {
+ ['OS=="win" and component!="shared_library"', {
'targets': [
{
'target_name': 'libcmt',
« no previous file with comments | « base/allocator/BUILD.gn ('k') | base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698