Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

Unified Diff: content/content_unittests.isolate

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_shell.gypi ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_unittests.isolate
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 61eca66f34384eddadedd7ae740682a3e6edd8f7..07ac6e751c863ca9b1965c06c0df2846009938f3 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -68,6 +68,7 @@
['OS=="linux"', {
'variables': {
'files': [
+ '<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
@@ -75,6 +76,7 @@
['OS=="mac"', {
'variables': {
'files': [
+ '<(PRODUCT_DIR)/ffmpegsumo.so',
'<(PRODUCT_DIR)/osmesa.so',
],
},
@@ -82,6 +84,7 @@
['OS=="win"', {
'variables': {
'files': [
+ '<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/osmesa.dll',
],
},
@@ -90,6 +93,7 @@
'variables': {
'files': [
'<(PRODUCT_DIR)/content_unittests.dSYM/',
+ '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
'<(PRODUCT_DIR)/osmesa.so.dSYM/',
],
},
« no previous file with comments | « content/content_shell.gypi ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698