commit 4699a6a4c1fa62cd72dfda7b08573678eabbcfa3
author Glenn Kasten <gkasten@google.com> Tue Feb 16 10:49:09 2016 -0800
committer Glenn Kasten <gkasten@google.com> Thu Feb 18 09:25:32 2016 -0800
tree 5ce6083c4b4b29fa6961ff59ab6f46b61a08f4af
parent 262c39e35bf88e09dab3e0ae9f7df84db64273bb

Clean up USE_NEON to make it easier to disable NEON for benchmarking

Bug: 27242871
Change-Id: I30ba8bfe55885cde531706c760ec27e593d7f8b3

services/audioflinger/AudioResamplerSinc.cpp

diff --git a/services/audioflinger/AudioResamplerSinc.cpp b/services/audioflinger/AudioResamplerSinc.cpp
index e93c064..f600d6c 100644
--- a/services/audioflinger/AudioResamplerSinc.cpp
+++ b/services/audioflinger/AudioResamplerSinc.cpp
@@ -43,10 +43,14 @@
 #endif
 
 #if defined(__aarch64__) || defined(__ARM_NEON__)
-#include <arm_neon.h>
-#define USE_NEON
+#ifndef USE_NEON
+#define USE_NEON (true)
+#endif
 #else
-#undef USE_NEON
+#define USE_NEON (false)
+#endif
+#if USE_NEON
+#include <arm_neon.h>
 #endif
 
 #define UNUSED(x) ((void)(x))
@@ -417,7 +421,7 @@
 
     size_t count = offset;
 
-#ifndef USE_NEON
+#if !USE_NEON
     int32_t l = 0;
     int32_t r = 0;
     for (size_t i=0 ; i<count ; i++) {