From 0abb8dda2d2a1f64a46cbd67a44564c1c763ffaa Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Wed, 25 Jan 2012 19:34:49 +0000
Subject: [PATCH] detect neon for ndk but not sdk BUG=none TEST=none Review
 URL: https://webrtc-codereview.appspot.com/366005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@152 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 README.chromium          | 2 +-
 include/libyuv/version.h | 2 +-
 source/cpu_id.cc         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.chromium b/README.chromium
index 16c4d9e4a..8ce85d3e4 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 151
+Version: 152
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index e12b55ba1..f4341ae4f 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -16,7 +16,7 @@ namespace libyuv {
 extern "C" {
 #endif
 
-#define LIBYUV_VERSION 151
+#define LIBYUV_VERSION 152
 
 #ifdef __cplusplus
 }  // extern "C"
diff --git a/source/cpu_id.cc b/source/cpu_id.cc
index d31e99fd8..252b7acc7 100644
--- a/source/cpu_id.cc
+++ b/source/cpu_id.cc
@@ -14,7 +14,7 @@
 #ifdef _MSC_VER
 #include <intrin.h>  // For __cpuid()
 #endif
-#ifdef __ANDROID__
+#if defined(__ANDROID__) && defined(NDK_ROOT)
 #include <cpu-features.h>  // For android_getCpuFeatures()
 #endif
 
@@ -65,7 +65,7 @@ int InitCpuFlags() {
   if (getenv("LIBYUV_DISABLE_SSSE3")) {
     cpu_info_ &= ~kCpuHasSSSE3;
   }
-#elif defined(__ANDROID__) && defined(__ARM_NEON__)
+#elif defined(__ANDROID__) && defined(__ARM_NEON__) && defined(NDK_ROOT)
   uint64_t features = android_getCpuFeatures();
   cpu_info_ = ((features & ANDROID_CPU_ARM_FEATURE_NEON) ? kCpuHasNEON : 0) |
               kCpuInitialized;