| OLD | NEW |
| 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 if (cpu_arch == "arm") { | 8 if (cpu_arch == "arm") { |
| 9 import("//build/config/arm.gni") | 9 import("//build/config/arm.gni") |
| 10 } | 10 } |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 defines += [ "MSVC" ] | 77 defines += [ "MSVC" ] |
| 78 include_dirs = [ "win" ] | 78 include_dirs = [ "win" ] |
| 79 if (cpu_arch == "x86") { | 79 if (cpu_arch == "x86") { |
| 80 defines += [ "WIN32" ] | 80 defines += [ "WIN32" ] |
| 81 } else { | 81 } else { |
| 82 defines += [ "WIN64" ] | 82 defines += [ "WIN64" ] |
| 83 } | 83 } |
| 84 } else if (is_mac) { | 84 } else if (is_mac) { |
| 85 defines += [ "MACHO" ] | 85 defines += [ "MACHO" ] |
| 86 include_dirs = [ "mac" ] | 86 include_dirs = [ "mac" ] |
| 87 } else if (is_linux) { | 87 } else if (is_linux || is_android) { |
| 88 defines += [ "ELF" ] | 88 defines += [ "ELF" ] |
| 89 include_dirs = [ "linux" ] | 89 include_dirs = [ "linux" ] |
| 90 } | 90 } |
| 91 } | 91 } |
| 92 } | 92 } |
| 93 | 93 |
| 94 source_set("simd") { | 94 source_set("simd") { |
| 95 if (cpu_arch == "x86") { | 95 if (cpu_arch == "x86") { |
| 96 deps = [ | 96 deps = [ |
| 97 ":simd_asm", | 97 ":simd_asm", |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 if (is_msan || is_linux) { | 202 if (is_msan || is_linux) { |
| 203 sources += [ "jsimd_none.c" ] | 203 sources += [ "jsimd_none.c" ] |
| 204 } else { | 204 } else { |
| 205 deps = [ | 205 deps = [ |
| 206 ":simd", | 206 ":simd", |
| 207 ] | 207 ] |
| 208 } | 208 } |
| 209 | 209 |
| 210 # TODO(GYP): Compile the .asm files with YASM as GYP does. | 210 # TODO(GYP): Compile the .asm files with YASM as GYP does. |
| 211 } | 211 } |
| OLD | NEW |