Update NEON compiler flags for Skia to use the SK_ prefix.

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 164 matching lines @@
     "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" ]
+      defines += [ "SK_ARM_HAS_NEON", "__ARM_HAVE_NEON" ]
     }
     if (arm_optionally_use_neon) {
-      defines += [ "__ARM_HAVE_OPTIONAL_NEON_SUPPORT" ]
+      defines += [ "SK_ARM_HAS_OPTIONAL_NEON", "__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",
     ]
@@ skipping 505 matching lines @@
     ":skia_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   deps = [
     "//base",
   ]
 
   visibility = ":skia"
 }