commit 37dc23b9917dcb997ee144936b2b27d3881942eb
author Tim Murray <timmurray@google.com> Wed Jun 18 16:31:24 2014 -0700
committer Tim Murray <timmurray@google.com> Wed Jun 18 16:31:24 2014 -0700
tree 9536678794f3452ad436198751cdb1d788fe804f
parent a5b1343e0db3eaf41ced3d9978cd72b8cf4cda1f

Fix build break caused by missing ifdefs.

Change-Id: I29e8e1c58b9702873a2a4b932794720ee279492e

lib/Renderscript/RSInfoExtractor.cpp

diff --git a/lib/Renderscript/RSInfoExtractor.cpp b/lib/Renderscript/RSInfoExtractor.cpp
index cd8f916..338243b 100644
--- a/lib/Renderscript/RSInfoExtractor.cpp
+++ b/lib/Renderscript/RSInfoExtractor.cpp
@@ -170,7 +170,7 @@
   string_pool_size += ::strlen(LibRSPath) + 1 + SHA1_DIGEST_LENGTH;
   string_pool_size += ::strlen(LibCLCorePath) + 1 + SHA1_DIGEST_LENGTH;
   string_pool_size += ::strlen(LibCLCoreDebugPath) + 1 + SHA1_DIGEST_LENGTH;
-#if defined(ARCH_ARM_HAVE_NEON)
+#if defined(ARCH_ARM_HAVE_NEON) && !defined(DISABLE_CLCORE_NEON)
   string_pool_size += ::strlen(LibCLCoreNEONPath) + 1 + SHA1_DIGEST_LENGTH;
 #endif
   for (unsigned i = 0, e = pDeps.size(); i != e; i++) {
@@ -396,7 +396,7 @@
       goto bail;
     }
 
-#if defined(ARCH_ARM_HAVE_NEON)
+#if defined(ARCH_ARM_HAVE_NEON) && !defined(DISABLE_CLCORE_NEON)
     if (!writeDependency(LibCLCoreNEONPath, LibCLCoreNEONSHA1,
                          result->mStringPool, &cur_string_pool_offset,
                          result->mDependencyTable)) {

lib/Renderscript/RSScript.cpp

diff --git a/lib/Renderscript/RSScript.cpp b/lib/Renderscript/RSScript.cpp
index 0051e1f..b7335ab 100644
--- a/lib/Renderscript/RSScript.cpp
+++ b/lib/Renderscript/RSScript.cpp
@@ -34,7 +34,7 @@
 
   // NEON-capable devices can use an accelerated math library for all
   // reduced precision scripts.
-#if defined(ARCH_ARM_HAVE_NEON)
+#if defined(ARCH_ARM_HAVE_NEON) && !defined(DISABLE_CLCORE_NEON)
   const RSInfo* info = pScript.getInfo();
   if ((info != NULL) &&
       (info->getFloatPrecisionRequirement() != RSInfo::FP_Full)) {