diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 10:31:16 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 10:31:16 +0000 |
| commit | ce01a8f2d351da3e469e67b07e708ed7e5bfd4cc (patch) | |
| tree | 5d9c97be513def5127e8fb3784a1ad4b110ccc9f /content/content_browsertests.isolate | |
| parent | a411e306ad3451cd20eb017fd112e0886db12b0c (diff) | |
| download | chromium_src-ce01a8f2d351da3e469e67b07e708ed7e5bfd4cc.zip chromium_src-ce01a8f2d351da3e469e67b07e708ed7e5bfd4cc.tar.gz chromium_src-ce01a8f2d351da3e469e67b07e708ed7e5bfd4cc.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_browsertests.isolate')
| -rw-r--r-- | content/content_browsertests.isolate | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index 2ed7523..ec5134b 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -29,6 +29,7 @@ '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', @@ -50,9 +51,10 @@ 'variables': { 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', - '<(PRODUCT_DIR)/content_resources.pak', '<(PRODUCT_DIR)/Content Shell.app/', + '<(PRODUCT_DIR)/content_resources.pak', '<(PRODUCT_DIR)/ffmpegsumo.so', + '<(PRODUCT_DIR)/libpeerconnection.so', '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin', '<(PRODUCT_DIR)/plugins/TestNestscapePlugin.plugin', ], @@ -62,6 +64,7 @@ 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', + '<(PRODUCT_DIR)/libpeerconnection.dll', ], 'isolate_dependency_untracked': [ # The two directories below are only needed for |