libvpx: exclude NEON target on x86 for GN build

BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/arm.gni")
 import("//build/config/android/config.gni")
 import("//third_party/libvpx/libvpx_srcs.gni")
 import("//third_party/yasm/yasm_assemble.gni")
 
 if (is_posix && !is_mac) {
@@ skipping 152 matching lines @@
 static_library("libvpx_intrinsics_sse4_1") {
   configs += [ ":libvpx_config" ]
   cflags = [ "-msse4.1" ]
   if (cpu_arch == "x86") {
     sources = libvpx_srcs_x86_sse4_1
   } else if (cpu_arch == "x64") {
     sources = libvpx_srcs_x86_64_sse4_1
   }
 }
 
-static_library("libvpx_intrinsics_neon") {
-  configs += [ ":libvpx_config" ]
-  cflags = [ "-mfpu=neon", "-mfloat-abi=softfp" ]
-  sources = libvpx_srcs_arm_neon_cpu_detect_neon
+if (cpu_arch_full == "arm-neon-cpu-detect") {
+  static_library("libvpx_intrinsics_neon") {
+    configs += [ ":libvpx_config" ]
+    cflags = [ "-mfpu=neon", "-mfloat-abi=softfp" ]
+    sources = libvpx_srcs_arm_neon_cpu_detect_neon
+  }
 }
 
 static_library("libvpx") {
   if (!is_debug && is_win && is_official_build) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 
   if (cpu_arch == "x86") {
     sources = libvpx_srcs_x86
@@ skipping 34 matching lines @@
     if (cpu_arch == "arm") {
       deps += [
 # TODO(hclam): GN build doesn't compile NEON intrinsics because
 # -mfpu=vfpv3-d16 needs to be removed.
 #        ":libvpx_intrinsics_neon"
       ]
     }
     deps += [ "//third_party/android_tools:cpu_features" ]
   }
 }