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

Unified Diff: testing/chromoting/chromoting_integration_tests.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 | « remoting/host/remoting_me2me_host.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/chromoting/chromoting_integration_tests.isolate
diff --git a/testing/chromoting/chromoting_integration_tests.isolate b/testing/chromoting/chromoting_integration_tests.isolate
index eb7fec054479c321a0517e293a8f4929b538fe86..6062cb2b2081c39f1ce07acef5c9968dc6c65636 100644
--- a/testing/chromoting/chromoting_integration_tests.isolate
+++ b/testing/chromoting/chromoting_integration_tests.isolate
@@ -24,6 +24,7 @@
'../xvfb.py',
'./browser_tests_launcher.py',
'./browser_test_commands_linux.txt',
+ '<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
'../../remoting/tools/internal/test-account-host-config.json',
@@ -70,6 +71,7 @@
'variables': {
'files': [
'<(PRODUCT_DIR)/chrome_elf.dll',
+ '<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/libglesv2.dll',
],
},
@@ -79,6 +81,7 @@
'files': [
'<(PRODUCT_DIR)/<(mac_product_name).app/',
'<(PRODUCT_DIR)/exif.so',
+ '<(PRODUCT_DIR)/ffmpegsumo.so',
],
},
}],
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698