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

skia/skia_library_opts.gyp

 # Copyright 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.
 
 
 # This gyp file contains the platform-specific optimizations for Skia
 {
   'targets': [
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The
@@ skipping 47 matching lines @@
             '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_SSE2.cpp',
           ],
           'dependencies': [
             'skia_opts_ssse3',
             'skia_opts_sse4',
           ],
         }],
         [ 'target_arch == "arm"', {
           'conditions': [
-            [ 'arm_version >= 7 and arm_neon == 1', {

[djsollen, 2014/07/31 16:05:54]

this is not needed as it is pulled in from the skia_common.gypi

-              'defines': [
-                '__ARM_HAVE_NEON',
-              ],
-            }],
-            [ 'arm_version >= 7 and arm_neon_optional == 1', {
-              'defines': [
-                '__ARM_HAVE_OPTIONAL_NEON_SUPPORT',
-              ],
-            }],
             [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
               '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',
               ],
               'dependencies': [
                 'skia_opts_neon',
@@ skipping 237 matching lines @@
             '../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h',
             '../third_party/skia/src/opts/SkBlitMask_opts_arm_neon.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
             '../third_party/skia/src/opts/SkBlurImage_opts_neon.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_neon.cpp',
             '../third_party/skia/src/opts/SkTextureCompression_opts_neon.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
             '../third_party/skia/src/opts/memset16_neon.S',
             '../third_party/skia/src/opts/memset32_neon.S',
           ],
-          'conditions': [

[djsollen, 2014/07/31 16:05:54]

same here

-            ['arm_neon == 1', {
-              'defines': [
-                '__ARM_HAVE_NEON',
-              ],
-            }],
-            ['arm_neon_optional == 1', {
-              'defines': [
-                '__ARM_HAVE_OPTIONAL_NEON_SUPPORT',
-              ],
-            }],
-          ],
         },
       ],
     }],
   ],
 }