diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-06 19:32:47 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-06 19:32:47 +0000 |
| commit | d49273933d3348c8bc80954003740446fcdce475 (patch) | |
| tree | 5fc8af9f0a2e7b09233e66cfc956912aa803d7e5 /chrome/chrome.isolate | |
| parent | 5adc1a756b2054a7f6e2b427974ed723b8b8ece8 (diff) | |
| download | chromium_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/chrome.isolate')
| -rw-r--r-- | chrome/chrome.isolate | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 86233c4..d115c8e 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -7,6 +7,7 @@ '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', @@ -51,15 +52,16 @@ ['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', |