chrome/chrome.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: chrome/chrome.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: chrome/chrome.isolate

diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate

index 43bc605622e9a9bdf9f6a636abc488f2b03db7a7..6ba6903d14e792ed3093c3a2da7d54139ae3c600 100644

--- a/chrome/chrome.isolate

+++ b/chrome/chrome.isolate

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

['OS=="linux"', {

'variables': {

'files': [

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

'<(PRODUCT_DIR)/libosmesa.so',

@@ -70,6 +71,7 @@

'<(PRODUCT_DIR)/<(mac_product_name) Helper.app/',

'<(PRODUCT_DIR)/<(mac_product_name).app/',

'<(PRODUCT_DIR)/exif.so',

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

}],

@@ -80,6 +82,7 @@

'<(PRODUCT_DIR)/<(mac_product_name) Helper.app.dSYM/',

'<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/',

'<(PRODUCT_DIR)/exif.so.dSYM/',

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

}],

@@ -90,6 +93,7 @@

'<(PRODUCT_DIR)/chrome_200_percent.pak',

'<(PRODUCT_DIR)/chrome.dll',

'<(PRODUCT_DIR)/chrome_elf.dll',

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

'<(PRODUCT_DIR)/libexif.dll',

'<(PRODUCT_DIR)/osmesa.dll',

« no previous file with comments | « cc/trees/layer_tree_host_unittest_context.cc ('k') | chrome/chrome_dll_bundle.gypi » ('j') | no next file with comments »