Commit 442a01c0 authored by Johann's avatar Johann Committed by Commit Bot

libvpx: use nasm

BUG=webm:1679

Change-Id: Ia2d3c1a81af2542dbe6c790405cc6d0492391005
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2136987Reviewed-by: default avatarJames Zern <jzern@google.com>
Commit-Queue: Johann Koenig <johannkoenig@google.com>
Cr-Commit-Position: refs/heads/master@{#756928}
parent a4ef9b14
...@@ -6,7 +6,7 @@ import("//build/config/android/config.gni") ...@@ -6,7 +6,7 @@ import("//build/config/android/config.gni")
import("//build/config/arm.gni") import("//build/config/arm.gni")
import("//build/config/sanitizers/sanitizers.gni") import("//build/config/sanitizers/sanitizers.gni")
import("//third_party/libvpx/libvpx_srcs.gni") import("//third_party/libvpx/libvpx_srcs.gni")
import("//third_party/yasm/yasm_assemble.gni") import("//third_party/nasm/nasm_assemble.gni")
# Sets the architecture name for building libvpx. # Sets the architecture name for building libvpx.
if (current_cpu == "x86") { if (current_cpu == "x86") {
...@@ -101,7 +101,7 @@ config("libvpx_external_config") { ...@@ -101,7 +101,7 @@ config("libvpx_external_config") {
} }
if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) { if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) {
yasm_assemble("libvpx_yasm") { nasm_assemble("libvpx_asm") {
if (current_cpu == "x86") { if (current_cpu == "x86") {
sources = libvpx_srcs_x86_assembly sources = libvpx_srcs_x86_assembly
} else if (current_cpu == "x64") { } else if (current_cpu == "x64") {
...@@ -344,6 +344,7 @@ static_library("libvpx") { ...@@ -344,6 +344,7 @@ static_library("libvpx") {
deps = [] deps = []
if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) { if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) {
deps += [ deps += [
":libvpx_asm",
":libvpx_intrinsics_avx", ":libvpx_intrinsics_avx",
":libvpx_intrinsics_avx2", ":libvpx_intrinsics_avx2",
":libvpx_intrinsics_avx512", ":libvpx_intrinsics_avx512",
...@@ -351,7 +352,6 @@ static_library("libvpx") { ...@@ -351,7 +352,6 @@ static_library("libvpx") {
":libvpx_intrinsics_sse2", ":libvpx_intrinsics_sse2",
":libvpx_intrinsics_sse4_1", ":libvpx_intrinsics_sse4_1",
":libvpx_intrinsics_ssse3", ":libvpx_intrinsics_ssse3",
":libvpx_yasm",
] ]
} }
if (cpu_arch_full == "arm-neon-cpu-detect") { if (cpu_arch_full == "arm-neon-cpu-detect") {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment