Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: src/core/SkUtilsArm.cpp

Issue 189263015: Only set USE_ANDROID_NDK_CPU_FEATURES if it's not already been explicitly set (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkUtilsArm.cpp
diff --git a/src/core/SkUtilsArm.cpp b/src/core/SkUtilsArm.cpp
index 87a4a7fb0ad2caea1aadffab1f73ea679c69f46e..58cf1157c307c604f59a16f43a923c87d309a809 100644
--- a/src/core/SkUtilsArm.cpp
+++ b/src/core/SkUtilsArm.cpp
@@ -20,10 +20,12 @@
// 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698