Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Side by Side Diff: third_party/BUILD.gn

Issue 1886443002: Revert "[iOS] Defaults to use system libjpeg on iOS." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put back "libs = [ ... ]" in system_libjpeg_config config Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « build/secondary/third_party/libjpeg_turbo/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 if (is_android) { 5 if (is_android) {
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 } 7 }
8 8
9 declare_args() { 9 declare_args() {
10 # Uses system libjpeg. If true, overrides use_libjpeg_turbo. 10 # Uses system libjpeg. If true, overrides use_libjpeg_turbo.
11 use_system_libjpeg = is_ios 11 use_system_libjpeg = false
12 12
13 # Uses libjpeg_turbo as the jpeg implementation. Has no effect if 13 # Uses libjpeg_turbo as the jpeg implementation. Has no effect if
14 # use_system_libjpeg is set. 14 # use_system_libjpeg is set.
15 use_libjpeg_turbo = true 15 use_libjpeg_turbo = true
16 } 16 }
17 17
18 config("system_libjpeg_config") { 18 config("system_libjpeg_config") {
19 libs = [ "jpeg" ] 19 libs = [ "jpeg" ]
20 defines = [ "USE_SYSTEM_LIBJPEG" ] 20 defines = [ "USE_SYSTEM_LIBJPEG" ]
21 } 21 }
(...skipping 12 matching lines...) Expand all
34 public_deps = [ 34 public_deps = [
35 "//third_party/libjpeg_turbo:libjpeg", 35 "//third_party/libjpeg_turbo:libjpeg",
36 ] 36 ]
37 public_configs = [ ":libjpeg_turbo_config" ] 37 public_configs = [ ":libjpeg_turbo_config" ]
38 } else { 38 } else {
39 public_deps = [ 39 public_deps = [
40 "//third_party/libjpeg:libjpeg", 40 "//third_party/libjpeg:libjpeg",
41 ] 41 ]
42 } 42 }
43 } 43 }
OLDNEW
« no previous file with comments | « build/secondary/third_party/libjpeg_turbo/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698