summaryrefslogtreecommitdiffstats
path: root/chrome/sync_integration_tests.isolate
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 10:31:16 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 10:31:16 +0000
commitce01a8f2d351da3e469e67b07e708ed7e5bfd4cc (patch)
tree5d9c97be513def5127e8fb3784a1ad4b110ccc9f /chrome/sync_integration_tests.isolate
parenta411e306ad3451cd20eb017fd112e0886db12b0c (diff)
downloadchromium_src-ce01a8f2d351da3e469e67b07e708ed7e5bfd4cc.zip
chromium_src-ce01a8f2d351da3e469e67b07e708ed7e5bfd4cc.tar.gz
chromium_src-ce01a8f2d351da3e469e67b07e708ed7e5bfd4cc.tar.bz2
Reland 198495 for Windows.
> Build libpeerconnection as a loadable module for win, mac and linux by default. Also remove the allocator shim variable since it's no longer needed. > > This requires updating .isolate files for some try bots. > In practice, I've only seen failures in interactive_ui_tests because of this change, but I'm being a bit proactive here and making sure that libpeerconnection.so exists with test hosts that have tests that depend on it. > > BUG=238207 > R=csharp@chromium.org, ronghuawu@chromium.org > > Review URL: https://codereview.chromium.org/14907003 TBR=tommi@chromium.org Review URL: https://codereview.chromium.org/14767016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/sync_integration_tests.isolate')
-rw-r--r--chrome/sync_integration_tests.isolate2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 76cf74e..84a6186 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -16,6 +16,7 @@
'../testing/xvfb.py',
'<(PRODUCT_DIR)/chrome.pak',
'<(PRODUCT_DIR)/chrome_100_percent.pak',
+ '<(PRODUCT_DIR)/lib/libpeerconnection.so',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
'<(PRODUCT_DIR)/locales/en-US.pak',
@@ -57,6 +58,7 @@
'<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/libpeerconnection.so',
'<(PRODUCT_DIR)/ffmpegsumo.so',
],
'isolate_dependency_untracked': [