Only set USE_ANDROID_NDK_CPU_FEATURES if it's not already been explicitly set

src/core/SkUtilsArm.cpp

 
 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkUtilsArm.h"
 
 #if SK_ARM_NEON_IS_DYNAMIC
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
 #include <pthread.h>
 
 // Set USE_ANDROID_NDK_CPU_FEATURES to use the Android NDK's
 // cpu-features helper library to detect NEON at runtime. See
 // http://crbug.com/164154 to see why this is needed in Chromium
 // for Android.
-#if defined(SK_BUILD_FOR_ANDROID)
-#  define USE_ANDROID_NDK_CPU_FEATURES 1
-#else
-#  define USE_ANDROID_NDK_CPU_FEATURES 0
+#if !defined(USE_ANDROID_NDK_CPU_FEATURES)
+#  if defined(SK_BUILD_FOR_ANDROID)
+#    define USE_ANDROID_NDK_CPU_FEATURES 1
+#  else
+#    define USE_ANDROID_NDK_CPU_FEATURES 0
+#  endif
 #endif
 
 #if USE_ANDROID_NDK_CPU_FEATURES
 #  include <cpu-features.h>
 #endif
 
 // Set NEON_DEBUG to 1 to allow debugging of the CPU features probing.
 // For now, we always set it for SK_DEBUG builds.
 #ifdef SK_DEBUG
 #  define NEON_DEBUG  1
@@ skipping 151 matching lines @@
 void sk_cpu_arm_probe_features(void) {
     sHasArmNeon = sk_cpu_arm_check_neon();
 }
 
 bool sk_cpu_arm_has_neon(void) {
     pthread_once(&sOnce, sk_cpu_arm_probe_features);
     return sHasArmNeon;
 }
 
 #endif // SK_ARM_NEON_IS_DYNAMIC