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

R=djsollen@google.com, reed@google.com
BUG=skia:

Author: george@mozilla.com

Review URL: https://codereview.chromium.org/189263015

git-svn-id: http://skia.googlecode.com/svn/trunk@13750 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-03-11 22:57:21 +00:00
parent c169f44460
commit e63306df4d

View File

@ -20,10 +20,12 @@
// cpu-features helper library to detect NEON at runtime. See // cpu-features helper library to detect NEON at runtime. See
// http://crbug.com/164154 to see why this is needed in Chromium // http://crbug.com/164154 to see why this is needed in Chromium
// for Android. // for Android.
#if defined(SK_BUILD_FOR_ANDROID) #if !defined(USE_ANDROID_NDK_CPU_FEATURES)
# define USE_ANDROID_NDK_CPU_FEATURES 1 # if defined(SK_BUILD_FOR_ANDROID)
#else # define USE_ANDROID_NDK_CPU_FEATURES 1
# define USE_ANDROID_NDK_CPU_FEATURES 0 # else
# define USE_ANDROID_NDK_CPU_FEATURES 0
# endif
#endif #endif
#if USE_ANDROID_NDK_CPU_FEATURES #if USE_ANDROID_NDK_CPU_FEATURES