diff options
| author | chcunningham <chcunningham@chromium.org> | 2015-06-04 19:26:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 02:27:15 +0000 |
| commit | a31b9ad7e78a1e6174fd218a78b0909079e0afd5 (patch) | |
| tree | 50726b0fd043b4a3e8e0252e231a16341c1eb682 /chrome/interactive_ui_tests.isolate | |
| parent | 4f2ff6852e6838ea671e0d2322a57b1c51b22948 (diff) | |
| download | chromium_src-a31b9ad7e78a1e6174fd218a78b0909079e0afd5.zip chromium_src-a31b9ad7e78a1e6174fd218a78b0909079e0afd5.tar.gz chromium_src-a31b9ad7e78a1e6174fd218a78b0909079e0afd5.tar.bz2 | |
Revert "Chromium changes to statically link ffmpeg."
Reverting because of component test failures around isolate expectations.
This change may not actually be directly responsible, but I'm out of time
to investigate for the day. Will re-land it soon.
BUG=496975
TBR=enne@chromium.org, gunsch@chromium.org, jochen@chromium.org, isherman@chromium.org, thomasvl@chromium.org, phajdan@chromium.org, grt@chromium.org, mmoss@chromium.org, sergeyu@chromium.org, sky@chromium.org, dalecurtis@chromium.org
This reverts commit bfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5.
NOPRESUBMIT=true
NOTRY=true
Review URL: https://codereview.chromium.org/1161183003
Cr-Commit-Position: refs/heads/master@{#332994}
Diffstat (limited to 'chrome/interactive_ui_tests.isolate')
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index f013ef6..084c69ab 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -35,6 +35,7 @@ ['OS=="linux"', { 'variables': { 'files': [ + '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', '<(PRODUCT_DIR)/libppapi_tests.so', '<(PRODUCT_DIR)/pyproto/google/', @@ -76,6 +77,7 @@ 'files': [ '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', '<(PRODUCT_DIR)/<(mac_product_name).app/', + '<(PRODUCT_DIR)/ffmpegsumo.so', '<(PRODUCT_DIR)/osmesa.so', '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', ], @@ -86,6 +88,7 @@ 'files': [ '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/', + '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/', '<(PRODUCT_DIR)/interactive_ui_tests.dSYM/', '<(PRODUCT_DIR)/osmesa.so.dSYM/', '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/', @@ -97,6 +100,7 @@ 'files': [ '<(PRODUCT_DIR)/chrome_elf.dll', '<(PRODUCT_DIR)/d3dcompiler_47.dll', + '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libGLESv2.dll', '<(PRODUCT_DIR)/osmesa.dll', |