diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/third_party/BUILD.gn | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
| download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz | |
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 <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/BUILD.gn')
| -rw-r--r-- | chromium/third_party/BUILD.gn | 4 |
1 files changed, 2 insertions, 2 deletions
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 = [ |