summaryrefslogtreecommitdiffstats
path: root/content/content_browsertests.isolate
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 19:21:43 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 19:21:43 +0000
commit77bb50035e0b9dca092b1eba8000ee5c389057dc (patch)
tree2dd97d8006b259ba74def70346f581258a6bcc4b /content/content_browsertests.isolate
parent01c7e7cccdf1beb1824fb990ac3fabf8865abe83 (diff)
downloadchromium_src-77bb50035e0b9dca092b1eba8000ee5c389057dc.zip
chromium_src-77bb50035e0b9dca092b1eba8000ee5c389057dc.tar.gz
chromium_src-77bb50035e0b9dca092b1eba8000ee5c389057dc.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_browsertests.isolate')
-rw-r--r--content/content_browsertests.isolate5
1 files changed, 1 insertions, 4 deletions
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index ec5134b..2ed7523 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -29,7 +29,6 @@
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/content_shell.pak',
'<(PRODUCT_DIR)/fonts.conf',
- '<(PRODUCT_DIR)/lib/libpeerconnection.so',
'<(PRODUCT_DIR)/libclearkeycdm.so',
'<(PRODUCT_DIR)/libclearkeycdmadapter.so',
'<(PRODUCT_DIR)/libffmpegsumo.so',
@@ -51,10 +50,9 @@
'variables': {
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
- '<(PRODUCT_DIR)/Content Shell.app/',
'<(PRODUCT_DIR)/content_resources.pak',
+ '<(PRODUCT_DIR)/Content Shell.app/',
'<(PRODUCT_DIR)/ffmpegsumo.so',
- '<(PRODUCT_DIR)/libpeerconnection.so',
'<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin',
'<(PRODUCT_DIR)/plugins/TestNestscapePlugin.plugin',
],
@@ -64,7 +62,6 @@
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/ffmpegsumo.dll',
- '<(PRODUCT_DIR)/libpeerconnection.dll',
],
'isolate_dependency_untracked': [
# The two directories below are only needed for