Commit 7c8c5806 authored by torne's avatar torne Committed by Commit bot

android_webview: stop using system libjpeg.

To support unbundled updates we need to stop depending on system
libraries. Disable using the system version of libjpeg and instead link
Chromium's libjpeg_turbo.

This increases binary size by ~120KB.

BUG=409851

Review URL: https://codereview.chromium.org/548513002

Cr-Commit-Position: refs/heads/master@{#293663}
parent 4e951c21
...@@ -48,6 +48,7 @@ class DepsWhitelist(object): ...@@ -48,6 +48,7 @@ class DepsWhitelist(object):
'third_party/leveldatabase/src', 'third_party/leveldatabase/src',
'third_party/libaddressinput/src', 'third_party/libaddressinput/src',
'third_party/libjingle/source/talk', 'third_party/libjingle/source/talk',
'third_party/libjpeg_turbo',
'third_party/libphonenumber/src/phonenumbers', 'third_party/libphonenumber/src/phonenumbers',
'third_party/libphonenumber/src/resources', 'third_party/libphonenumber/src/resources',
'third_party/libsrtp', 'third_party/libsrtp',
......
...@@ -880,12 +880,6 @@ ...@@ -880,12 +880,6 @@
'use_libjpeg_turbo%': 0, 'use_libjpeg_turbo%': 0,
}], }],
['OS=="android"', {
# When building as part of the Android system, use system libraries
# where possible to reduce ROM size.
'use_system_libjpeg%': '<(android_webview_build)',
}],
# Do not enable the Settings App on ChromeOS. # Do not enable the Settings App on ChromeOS.
['enable_app_list==1 and chromeos==0', { ['enable_app_list==1 and chromeos==0', {
'enable_settings_app%': 1, 'enable_settings_app%': 1,
......
...@@ -8,7 +8,7 @@ if (is_android) { ...@@ -8,7 +8,7 @@ if (is_android) {
declare_args() { declare_args() {
# Uses system libjpeg. If true, overrides use_libjpeg_turbo. # Uses system libjpeg. If true, overrides use_libjpeg_turbo.
use_system_libjpeg = is_android && is_android_webview_build use_system_libjpeg = false
# Uses libjpeg_turbo as the jpeg implementation. Has no effect if # Uses libjpeg_turbo as the jpeg implementation. Has no effect if
# use_system_libjpeg is set. # use_system_libjpeg is set.
......
...@@ -95,11 +95,6 @@ ...@@ -95,11 +95,6 @@
'/usr/local/include', '/usr/local/include',
], ],
}], }],
['OS=="android"', {
'include_dirs': [
'<(android_src)/external/jpeg',
],
}],
], ],
}, },
'link_settings': { 'link_settings': {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment