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-07 21:59:36 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 21:59:36 +0000
commitdeb660f757b07d7d54bb446b60bfa0571a18d94a (patch)
tree94b04a0da6739e0ef833bb6c579f4affea2f72bb /content/content_browsertests.isolate
parent481f5805b3740d7d8bae9d28dbcc8c572fbdf1f0 (diff)
downloadchromium_src-deb660f757b07d7d54bb446b60bfa0571a18d94a.zip
chromium_src-deb660f757b07d7d54bb446b60bfa0571a18d94a.tar.gz
chromium_src-deb660f757b07d7d54bb446b60bfa0571a18d94a.tar.bz2
Revert 198675 "Reland 198495 for Windows."
> 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 TBR=tommi@chromium.org Review URL: https://codereview.chromium.org/14615011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198809 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