summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.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 /chrome/chrome.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 'chrome/chrome.isolate')
-rw-r--r--chrome/chrome.isolate4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
index d115c8e..86233c4 100644
--- a/chrome/chrome.isolate
+++ b/chrome/chrome.isolate
@@ -7,7 +7,6 @@
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/chrome.pak',
- '<(PRODUCT_DIR)/lib/libpeerconnection.so',
'<(PRODUCT_DIR)/libclearkeycdm.so',
'<(PRODUCT_DIR)/libclearkeycdmadapter.so',
'<(PRODUCT_DIR)/libffmpegsumo.so',
@@ -52,16 +51,15 @@
['OS=="win"', {
'variables': {
'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/D3DCompiler_43.dll',
'<(PRODUCT_DIR)/chrome.dll',
'<(PRODUCT_DIR)/clearkeycdm.dll',
'<(PRODUCT_DIR)/clearkeycdmadapter.dll',
- '<(PRODUCT_DIR)/D3DCompiler_43.dll',
'<(PRODUCT_DIR)/d3dcompiler_46.dll',
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/icudt.dll',
'<(PRODUCT_DIR)/libEGL.dll',
'<(PRODUCT_DIR)/libGLESv2.dll',
- '<(PRODUCT_DIR)/libpeerconnection.dll',
'<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/osmesa.dll',
'<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',