diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 19:05:35 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 19:05:35 +0000 |
| commit | 32569ac879a8335be82d6770d05adb3f1f6f815e (patch) | |
| tree | 2c30ba70a95872aa314ef0130af1a77f7fa9c8e2 /base | |
| parent | 688d06720580bd44cac33e2ad2908fa41849179e (diff) | |
| download | chromium_src-32569ac879a8335be82d6770d05adb3f1f6f815e.zip chromium_src-32569ac879a8335be82d6770d05adb3f1f6f815e.tar.gz chromium_src-32569ac879a8335be82d6770d05adb3f1f6f815e.tar.bz2 | |
Fixed isolates for content_gl_tests and Chrome in component builds.
Tested on Windows, Mac and Linux with the GPU bots' recipe.
BUG=378021
R=maruel@chromium.org,vadimsh@chromium.org,csharp@chromium.org
Review URL: https://codereview.chromium.org/303473007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.isolate | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/base/base.isolate b/base/base.isolate index 442d168..aeab5ef 100644 --- a/base/base.isolate +++ b/base/base.isolate @@ -8,4 +8,22 @@ # exception is the Windows sandbox (?). '../third_party/icu/icu.isolate', ], + 'conditions': [ + ['OS=="win" and component=="shared_library"', { + '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. + '<(PRODUCT_DIR)/msvcp120d.dll', + '<(PRODUCT_DIR)/msvcp120.dll', + '<(PRODUCT_DIR)/msvcr120d.dll', + '<(PRODUCT_DIR)/msvcr120.dll', + ], + }, + }], + ], } |