content/content_browsertests.isolate - Issue 1161183003: Revert "Chromium changes to statically link ffmpeg."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_browsertests.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

Index: content/content_browsertests.isolate

diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate

index a6f069f7329a1a997c0b7bbb6d7f41af13080d3d..2fcab670f2a8c53c176b10625265208523d39555 100644

--- a/content/content_browsertests.isolate

+++ b/content/content_browsertests.isolate

@@ -66,6 +66,7 @@

'variables': {

'files': [

'<(PRODUCT_DIR)/content_shell.pak',

+ '<(PRODUCT_DIR)/libffmpegsumo.so',

'<(PRODUCT_DIR)/libosmesa.so',

@@ -95,6 +96,7 @@

'variables': {

'files': [

'<(PRODUCT_DIR)/Content Shell.app/',

+ '<(PRODUCT_DIR)/ffmpegsumo.so',

'<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',

'<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/',

'<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',

@@ -108,6 +110,7 @@

'<(PRODUCT_DIR)/Content Shell Helper.app.dSYM/',

'<(PRODUCT_DIR)/Content Shell.app.dSYM/',

'<(PRODUCT_DIR)/content_browsertests.dSYM/',

+ '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',

'<(PRODUCT_DIR)/npapi_test_plugin.plugin.dSYM/',

'<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/',

'<(PRODUCT_DIR)/test_netscape_plugin.plugin.dSYM/',

@@ -118,6 +121,7 @@

'variables': {

'files': [

'<(PRODUCT_DIR)/content_shell.pak',

+ '<(PRODUCT_DIR)/ffmpegsumo.dll',

'<(PRODUCT_DIR)/osmesa.dll',

'<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',

'<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',

« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/content_gl_tests.isolate » ('j') | no next file with comments »