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

Unified Diff: base/base.isolate

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 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/base.gypi ('k') | base/debug/task_annotator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.isolate
diff --git a/base/base.isolate b/base/base.isolate
index c23fdd4ef240bbe2356e1a9dba330f3a66ea79ab..021c01cda1012cf0b02524de722c7fd224c264f6 100644
--- a/base/base.isolate
+++ b/base/base.isolate
@@ -23,7 +23,7 @@
],
},
}],
- ['OS=="win" and asan==1', {
+ ['OS=="win" and asan==1 and component=="shared_library"', {
'variables': {
'files': [
'../third_party/llvm-build/Release+Asserts/lib/clang/3.7.0/lib/windows/clang_rt.asan_dynamic-i386.dll',
@@ -53,7 +53,7 @@
],
},
}],
- ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"', {
+ ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
'variables': {
'files': [
# Copy the VS runtime DLLs into the isolate so that they
@@ -65,7 +65,7 @@
],
},
}],
- ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release"', {
+ ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
'variables': {
'files': [
# Copy the VS runtime DLLs into the isolate so that they
« no previous file with comments | « base/base.gypi ('k') | base/debug/task_annotator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698