diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 21:59:36 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 21:59:36 +0000 |
| commit | deb660f757b07d7d54bb446b60bfa0571a18d94a (patch) | |
| tree | 94b04a0da6739e0ef833bb6c579f4affea2f72bb /chrome/browser_tests.isolate | |
| parent | 481f5805b3740d7d8bae9d28dbcc8c572fbdf1f0 (diff) | |
| download | chromium_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/browser_tests.isolate')
| -rw-r--r-- | chrome/browser_tests.isolate | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 1fff561..a7eb600 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -14,16 +14,15 @@ ], 'isolate_dependency_tracked': [ '../testing/xvfb.py', + '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/lib/libpeerconnection.so', '<(PRODUCT_DIR)/libclearkeycdm.so', '<(PRODUCT_DIR)/libclearkeycdmadapter.so', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', - '<(PRODUCT_DIR)/libppapi_tests.so', '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', + '<(PRODUCT_DIR)/libppapi_tests.so', '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', @@ -101,11 +100,10 @@ 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/ffmpegsumo.so', - '<(PRODUCT_DIR)/libpeerconnection.so', - '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/Info.plist', - '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/MacOS/npapi_test_plugin', '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/Contents/Info.plist', '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/Contents/MacOS/TestNetscapePlugIn', + '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/Info.plist', + '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/MacOS/npapi_test_plugin', '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe', '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', ], @@ -131,19 +129,18 @@ '../native_client/build/build_nexe.py', '../third_party/cygwin/bin/bash.exe', '../third_party/cygwin/setup_mount.bat', + '<(PRODUCT_DIR)/D3DCompiler_43.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)/ppapi_tests.dll', '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', + '<(PRODUCT_DIR)/ppapi_tests.dll', '<(PRODUCT_DIR)/security_tests.dll', 'tools/build/repack_locales.py', ], |