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

Side by Side Diff: build/secondary/third_party/libjpeg_turbo/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 | « no previous file | third_party/BUILD.gn » ('j') | 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 # Do not use the targets in this file unless you need a certain libjpeg 5 # Do not use the targets in this file unless you need a certain libjpeg
6 # implementation. Use the meta target //third_party:jpeg instead. 6 # implementation. Use the meta target //third_party:jpeg instead.
7 7
8 import("//build/config/sanitizers/sanitizers.gni") 8 import("//build/config/sanitizers/sanitizers.gni")
9 if (current_cpu == "arm") { 9 if (current_cpu == "arm") {
10 import("//build/config/arm.gni") 10 import("//build/config/arm.gni")
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 } 75 }
76 76
77 if (is_win) { 77 if (is_win) {
78 defines += [ "MSVC" ] 78 defines += [ "MSVC" ]
79 include_dirs = [ "win" ] 79 include_dirs = [ "win" ]
80 if (current_cpu == "x86") { 80 if (current_cpu == "x86") {
81 defines += [ "WIN32" ] 81 defines += [ "WIN32" ]
82 } else { 82 } else {
83 defines += [ "WIN64" ] 83 defines += [ "WIN64" ]
84 } 84 }
85 } else if (is_mac) { 85 } else if (is_mac || is_ios) {
86 defines += [ "MACHO" ] 86 defines += [ "MACHO" ]
87 include_dirs = [ "mac" ] 87 include_dirs = [ "mac" ]
88 } else if (is_linux || is_android) { 88 } else if (is_linux || is_android) {
89 defines += [ "ELF" ] 89 defines += [ "ELF" ]
90 include_dirs = [ "linux" ] 90 include_dirs = [ "linux" ]
91 } 91 }
92 } 92 }
93 } 93 }
94 94
95 source_set("simd") { 95 source_set("simd") {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 # MemorySanitizer doesn't support assembly code, so keep it disabled in 205 # MemorySanitizer doesn't support assembly code, so keep it disabled in
206 # MSan builds for now. 206 # MSan builds for now.
207 if (is_msan) { 207 if (is_msan) {
208 sources += [ "jsimd_none.c" ] 208 sources += [ "jsimd_none.c" ]
209 } else { 209 } else {
210 deps = [ 210 deps = [
211 ":simd", 211 ":simd",
212 ] 212 ]
213 } 213 }
214 } 214 }
OLDNEW
« no previous file with comments | « no previous file | third_party/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698