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

Unified Diff: base/base.isolate

Issue 373973002: Set CONFIGURATION_NAME to be used in base.isolate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | build/android/pylib/gtest/setup.py » ('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 aeab5ef3c2e528eed6d5ac84e1ff9acfebd9f3be..c7232845da618d1741c443c741adcef19dbd0bfb 100644
--- a/base/base.isolate
+++ b/base/base.isolate
@@ -9,18 +9,22 @@
'../third_party/icu/icu.isolate',
],
'conditions': [
- ['OS=="win" and component=="shared_library"', {
+ ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"', {
'variables': {
'isolate_dependency_tracked': [
# Copy the VS runtime DLLs into the isolate so that they
- # don't have to be preinstalled on the target machine. Note
- # that depending on whether the build is Debug or Release,
- # half of these dependencies will be broken, so these
- # dependencies require --ignore-broken-items to be passed to
- # the isolate driver.
+ # don't have to be preinstalled on the target machine.
'<(PRODUCT_DIR)/msvcp120d.dll',
- '<(PRODUCT_DIR)/msvcp120.dll',
'<(PRODUCT_DIR)/msvcr120d.dll',
+ ],
+ },
+ }],
+ ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ # Copy the VS runtime DLLs into the isolate so that they
+ # don't have to be preinstalled on the target machine.
+ '<(PRODUCT_DIR)/msvcp120.dll',
'<(PRODUCT_DIR)/msvcr120.dll',
],
},
« no previous file with comments | « no previous file | build/android/pylib/gtest/setup.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698