From 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 9 May 2016 14:22:11 +0200 Subject: BASELINE: Update Chromium to 51.0.2704.41 Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann --- chromium/third_party/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chromium/third_party/BUILD.gn') diff --git a/chromium/third_party/BUILD.gn b/chromium/third_party/BUILD.gn index cf62b83fca2..6d97aafdbce 100644 --- a/chromium/third_party/BUILD.gn +++ b/chromium/third_party/BUILD.gn @@ -8,7 +8,7 @@ if (is_android) { declare_args() { # Uses system libjpeg. If true, overrides use_libjpeg_turbo. - use_system_libjpeg = false + use_system_libjpeg = is_ios # Uses libjpeg_turbo as the jpeg implementation. Has no effect if # use_system_libjpeg is set. @@ -16,6 +16,7 @@ declare_args() { } config("system_libjpeg_config") { + libs = [ "jpeg" ] defines = [ "USE_SYSTEM_LIBJPEG" ] } @@ -28,7 +29,6 @@ config("libjpeg_turbo_config") { # declared in this file. group("jpeg") { if (use_system_libjpeg) { - libs = [ "jpeg" ] public_configs = [ ":system_libjpeg_config" ] } else if (use_libjpeg_turbo) { public_deps = [ -- cgit v1.2.1