summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authorchcunningham <chcunningham@chromium.org>2015-06-04 12:55:51 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-04 19:57:13 +0000
commitbfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5 (patch)
treee44e230c1eb6a49d331c006de1942e25bf921590 /chrome/tools
parent3e11c986844af1cdda66e72e874763437ef426a0 (diff)
downloadchromium_src-bfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5.zip
chromium_src-bfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5.tar.gz
chromium_src-bfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5.tar.bz2
Chromium changes to statically link ffmpeg.
Motivations: 1. Eliminates a large number of windows crashes hit while loading the DLL (see bugs) 2. Reducing the size of binary (about 400KB on linux, about 265KB on 32bit windows) due to dead-code elimination 3. Simplifying media library initialization (Remove bool-ness, it just works) Licensing: We've audited all the licenses for the files we actually use and have the green light from legal as long as we include the license text in the credits. BUG=435455, 429131, 441908 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1141703002 Cr-Commit-Position: refs/heads/master@{#332891}
Diffstat (limited to 'chrome/tools')
-rw-r--r--chrome/tools/build/chromeos/FILES.cfg4
-rw-r--r--chrome/tools/build/linux/FILES.cfg4
-rw-r--r--chrome/tools/build/mac/TESTS1
-rwxr-xr-xchrome/tools/build/mac/dump_product_syms1
-rw-r--r--chrome/tools/build/win/FILES.cfg5
5 files changed, 0 insertions, 15 deletions
diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg
index 9bed5dd..1089fd2 100644
--- a/chrome/tools/build/chromeos/FILES.cfg
+++ b/chrome/tools/build/chromeos/FILES.cfg
@@ -61,10 +61,6 @@ FILES = [
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'libffmpegsumo.so',
- 'buildtype': ['dev', 'official'],
- },
- {
'filename': 'lib/libexif.so',
'buildtype': ['dev', 'official'],
},
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index 8ec10a5..52a09f2 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -72,10 +72,6 @@ FILES = [
'buildtype': ['official'],
},
{
- 'filename': 'libffmpegsumo.so',
- 'buildtype': ['dev', 'official'],
- },
- {
'filename': 'lib/libpeerconnection.so',
'buildtype': ['dev', 'official'],
'optional': ['dev', 'official'],
diff --git a/chrome/tools/build/mac/TESTS b/chrome/tools/build/mac/TESTS
index 4a81ea9..d77adcf 100644
--- a/chrome/tools/build/mac/TESTS
+++ b/chrome/tools/build/mac/TESTS
@@ -1,3 +1,2 @@
sync_integration_tests
exif.so
-ffmpegsumo.so
diff --git a/chrome/tools/build/mac/dump_product_syms b/chrome/tools/build/mac/dump_product_syms
index c9ef590..0673a1e 100755
--- a/chrome/tools/build/mac/dump_product_syms
+++ b/chrome/tools/build/mac/dump_product_syms
@@ -81,7 +81,6 @@ SRC_NAMES=(
"${SRC_APP_NAME} Helper.app"
"crashpad_handler"
"exif.so"
- "ffmpegsumo.so"
)
# PDF.plugin is optional. Only include it if present.
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 6c779d5..2dcef76 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -41,11 +41,6 @@ FILES = [
'archive': 'sync_integration_tests.exe',
},
{
- 'filename': 'ffmpegsumo.dll',
- 'buildtype': ['dev', 'official'],
- 'filegroup': ['default', 'symsrc'],
- },
- {
'filename': 'chrome.exe',
'buildtype': ['dev', 'official'],
'filegroup': ['default', 'symsrc'],