From 71b60123dcedd6875ab76377d9e10de16bb7643d Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 14 Dec 2015 11:48:06 -0800 Subject: [PATCH] GN: Fix neon files not being included for arm64 BUG=568883 R=fbarchard@chromium.org Review URL: https://codereview.chromium.org/1516653004 . --- BUILD.gn | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index f0f8404b8..d1e55de16 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,7 +16,7 @@ config("libyuv_config") { ] } -use_neon = current_cpu == "arm" && (arm_use_neon || arm_optionally_use_neon) +use_neon = current_cpu == "arm64" || (current_cpu == "arm" && (arm_use_neon || arm_optionally_use_neon)) source_set("libyuv") { sources = [ @@ -125,7 +125,9 @@ if (use_neon) { public_configs = [ ":libyuv_config" ] - configs -= [ "//build/config/compiler:compiler_arm_fpu" ] - cflags = [ "-mfpu=neon" ] + if (current_cpu != "arm64") { + configs -= [ "//build/config/compiler:compiler_arm_fpu" ] + cflags = [ "-mfpu=neon" ] + } } }