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-06 19:32:47 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 19:32:47 +0000
commitd49273933d3348c8bc80954003740446fcdce475 (patch)
tree5fc8af9f0a2e7b09233e66cfc956912aa803d7e5 /chrome/sync_integration_tests.isolate
parent5adc1a756b2054a7f6e2b427974ed723b8b8ece8 (diff)
downloadchromium_src-d49273933d3348c8bc80954003740446fcdce475.zip
chromium_src-d49273933d3348c8bc80954003740446fcdce475.tar.gz
chromium_src-d49273933d3348c8bc80954003740446fcdce475.tar.bz2
Revert 198503 "Revert 198495 "Build libpeerconnection as a loada..."
(was a false positive revert) > Revert 198495 "Build libpeerconnection as a loadable module for ..." > > > 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/15005004 TBR=tommi@chromium.org Review URL: https://codereview.chromium.org/14919005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198507 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': [