| Index: src/core/SkBitmapProcState_matrixProcs.cpp | 
| diff --git a/src/core/SkBitmapProcState_matrixProcs.cpp b/src/core/SkBitmapProcState_matrixProcs.cpp | 
| index 16f1bc6f283ae54ff6781416089b6e306bd1708c..1b747de280a279382f58ef7005ac63ee65081302 100644 | 
| --- a/src/core/SkBitmapProcState_matrixProcs.cpp | 
| +++ b/src/core/SkBitmapProcState_matrixProcs.cpp | 
| @@ -47,16 +47,16 @@ void decal_filter_scale(uint32_t dst[], SkFixed fx, SkFixed dx, int count); | 
| /////////////////////////////////////////////////////////////////////////////// | 
|  | 
| // Compile neon code paths if needed | 
| -#if !SK_ARM_NEON_IS_NONE | 
| +#if defined(SK_ARM_HAS_NEON) | 
|  | 
| // These are defined in src/opts/SkBitmapProcState_matrixProcs_neon.cpp | 
| extern const SkBitmapProcState::MatrixProc ClampX_ClampY_Procs_neon[]; | 
| extern const SkBitmapProcState::MatrixProc RepeatX_RepeatY_Procs_neon[]; | 
|  | 
| -#endif // !SK_ARM_NEON_IS_NONE | 
| +#endif // defined(SK_ARM_HAS_NEON) | 
|  | 
| // Compile non-neon code path if needed | 
| -#if !SK_ARM_NEON_IS_ALWAYS | 
| +#if !defined(SK_ARM_HAS_NEON) | 
| #define MAKENAME(suffix)        ClampX_ClampY ## suffix | 
| #define TILEX_PROCF(fx, max)    SkClampMax((fx) >> 16, max) | 
| #define TILEY_PROCF(fy, max)    SkClampMax((fy) >> 16, max) | 
|  |