Fix optional neon support

skia/BUILD.gn

 # Copyright (c) 2013 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/features.gni")
 import("//build/config/ui.gni")
 if (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
 
@@ skipping 162 matching lines @@
     "SK_IGNORE_BLURRED_RRECT_OPT",
 
     "SK_IGNORE_QUAD_RR_CORNERS_OPT",
 
     # this flag forces Skia not to use typographic metrics with GDI.
     "SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS",
 
     "SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
   ]
 
+  if (cpu_arch == "arm") {
+    if (arm_use_neon) {
+      defines += [ "__ARM_HAVE_NEON" ]
+    }
+    if (arm_optionally_use_neon) {
+      defines += [ "__ARM_HAVE_OPTIONAL_NEON_SUPPORT" ]
+    }
+  }
+
   # Settings for text blitting, chosen to approximate the system browser.
   if (is_linux) {
     defines += [
       "SK_GAMMA_EXPONENT=1.2",
       "SK_GAMMA_CONTRAST=0.2",
       "SK_HIGH_QUALITY_IS_LANCZOS",
     ]
   } else if (is_android) {
     defines += [
       "SK_GAMMA_APPLY_TO_A8",
@@ skipping 426 matching lines @@
 
         cflags += [
           # The neon assembly contains conditional instructions which aren't
           # enclosed in an IT block. The assembler complains without this
           # option. See #86592.
           "-Wa,-mimplicit-it=always",
         ]
 
         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
         # when running this.
-        assert(arm_fpu == "neon")
+        if (!arm_use_neon) {
+          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+          cflags += [
+            "-mfpu=neon"
+          ]
+        }
 
         #ldflags = [
         #  "-march=armv7-a",
         #  "-Wl,--fix-cortex-a8",
         #]
       }
-
-      if (arm_use_neon) {
-        defines += [ "__ARM_HAVE_NEON" ]
-      }
-      if (arm_optionally_use_neon) {
-        defines += [ "__ARM_HAVE_OPTIONAL_NEON_SUPPORT" ]
-      }
     }
 
     # Non-Neon ARM code.
     if (arm_version < 7 || !arm_use_neon) {
       sources += [ "//third_party/skia/src/opts/memset.arm.S" ]
     }
 
     if (arm_version < 6) {
       sources += [
         "//third_party/skia/src/opts/SkBlitMask_opts_none.cpp",
@@ skipping 39 matching lines @@
     ":skia_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   deps = [
     "//base",
   ]
 
   visibility = ":skia"
 }