When NEON disabled, always build ARM memset routines.

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 613 matching lines @@
 
       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 && arm_optionally_use_neon)) {
+    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",
         "//third_party/skia/src/opts/SkBlitRow_opts_none.cpp",
         "//third_party/skia/src/opts/SkUtils_opts_none.cpp",
         "//third_party/skia/src/opts/SkXfermode_opts_none.cpp",
         "//third_party/skia/src/opts/SkMorphology_opts_none.cpp",
@@ skipping 32 matching lines @@
     ":skia_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   deps = [
     "//base",
   ]
 
   visibility = ":skia"
 }