| 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 import("//build/config/arm.gni") | 5 import("//build/config/arm.gni") |
| 6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") |
| 7 import("//build/config/chrome_build.gni") | 7 import("//build/config/chrome_build.gni") |
| 8 import("//build/config/sanitizers/sanitizers.gni") |
| 8 import("//third_party/libvpx/libvpx_srcs.gni") | 9 import("//third_party/libvpx/libvpx_srcs.gni") |
| 9 import("//third_party/yasm/yasm_assemble.gni") | 10 import("//third_party/yasm/yasm_assemble.gni") |
| 10 | 11 |
| 11 # Sets the architecture name for building libvpx. | 12 # Sets the architecture name for building libvpx. |
| 12 if (current_cpu == "x86") { | 13 if (current_cpu == "x86") { |
| 13 cpu_arch_full = "ia32" | 14 cpu_arch_full = "ia32" |
| 14 } else if (current_cpu == "x64") { | 15 } else if (current_cpu == "x64") { |
| 15 if (is_msan) { | 16 if (is_msan) { |
| 16 cpu_arch_full = "generic" | 17 cpu_arch_full = "generic" |
| 17 } else { | 18 } else { |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 } | 267 } |
| 267 if (is_android) { | 268 if (is_android) { |
| 268 deps += [ "//third_party/android_tools:cpu_features" ] | 269 deps += [ "//third_party/android_tools:cpu_features" ] |
| 269 } | 270 } |
| 270 if (current_cpu == "arm") { | 271 if (current_cpu == "arm") { |
| 271 deps += [ ":libvpx_assembly_arm" ] | 272 deps += [ ":libvpx_assembly_arm" ] |
| 272 } | 273 } |
| 273 | 274 |
| 274 public_configs = [ ":libvpx_external_config" ] | 275 public_configs = [ ":libvpx_external_config" ] |
| 275 } | 276 } |
| OLD | NEW |