| 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 (current_cpu == "arm") { | 8 if (current_cpu == "arm") { |
| 9 import("//build/config/arm.gni") | 9 import("//build/config/arm.gni") |
| 10 } | 10 } |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 "MOTION_JPEG_SUPPORTED", | 191 "MOTION_JPEG_SUPPORTED", |
| 192 "NO_GETENV", | 192 "NO_GETENV", |
| 193 ] | 193 ] |
| 194 | 194 |
| 195 configs += [ ":libjpeg_config" ] | 195 configs += [ ":libjpeg_config" ] |
| 196 | 196 |
| 197 public_configs = [ ":libjpeg_config" ] | 197 public_configs = [ ":libjpeg_config" ] |
| 198 | 198 |
| 199 # MemorySanitizer doesn't support assembly code, so keep it disabled in | 199 # MemorySanitizer doesn't support assembly code, so keep it disabled in |
| 200 # MSan builds for now. | 200 # MSan builds for now. |
| 201 # TODO: Enable on Linux when .asm files are recognized. | 201 if (is_msan) { |
| 202 if (is_msan || is_linux) { | |
| 203 sources += [ "jsimd_none.c" ] | 202 sources += [ "jsimd_none.c" ] |
| 204 } else { | 203 } else { |
| 205 deps = [ | 204 deps = [ |
| 206 ":simd", | 205 ":simd", |
| 207 ] | 206 ] |
| 208 } | 207 } |
| 209 | |
| 210 # TODO(GYP): Compile the .asm files with YASM as GYP does. | |
| 211 } | 208 } |
| OLD | NEW |