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

Unified Diff: extensions/shell/app_shell.gyp

Issue 649793003: Fix windows static library build of app_shell_browsertests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/app_shell.gyp
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 94993a98dcfee4071698d5fd46320b6a914a9701..0e1ad76038eae857d042a4a0726ae1f556e0ad07 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -161,6 +161,11 @@
'<(DEPTH)/sandbox/sandbox.gyp:sandbox',
],
}],
+ ['OS=="win" and win_use_allocator_shim==1', {
+ 'dependencies': [
+ '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+ ],
+ }],
],
},
{
@@ -199,6 +204,13 @@
'test/shell_test_launcher_delegate.h',
'test/shell_tests_main.cc',
],
+ 'conditions': [
+ ['OS=="win" and win_use_allocator_shim==1', {
+ 'dependencies': [
+ '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
},
{
'target_name': 'app_shell_unittests',
@@ -232,6 +244,11 @@
'<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
],
}],
+ ['OS=="win" and win_use_allocator_shim==1', {
+ 'dependencies': [
+ '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+ ],
+ }],
],
},
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698