commit d95e906f135ab9c7a7ac4c9f5d2cef8beb154a88
author Matteo Martincigh <matteo.martincigh@arm.com> Thu Jan 31 15:35:59 2019 +0000
committer Matteo Martincigh <matteo.martincigh@arm.com> Fri Feb 01 10:24:15 2019 +0000
tree da56a3d5b9546409d7860126a46419e5b0eaa7d5
parent 339bcae73515c66899432b5844d7c239c570c4b8

IVGCVSW-2603 The macros ARMCOMPUTECL_ENABLED and ARMCOMPUTENEON_ENABLED
no longer work

 * Added two master variables ARMNN_COMPUTE_CL_ENABLED and ARMNN_COMPUTE_NEON_ENABLED
   to android-nn-driver/Android.mk to easily control backend support
 * Setting either of those two new variables then properly sets the
   corresponding build macro
 * If a specific backend gets disabled, the corresponding source files
   will be excluded from the build
 * Unified the usage of the pre-compile macros

!android-nn-driver:613

Change-Id: I582ff73493b70ba9e22ca2e38d875a0f19566c8a
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>

src/backends/aclCommon/BaseMemoryManager.cpp

diff --git a/src/backends/aclCommon/BaseMemoryManager.cpp b/src/backends/aclCommon/BaseMemoryManager.cpp
index f564dc6..7c06ec5 100644
--- a/src/backends/aclCommon/BaseMemoryManager.cpp
+++ b/src/backends/aclCommon/BaseMemoryManager.cpp
@@ -89,7 +89,7 @@
 }
 #endif
 
-#ifdef ARMCOMPUTENEON_ENABLED
+#if defined(ARMCOMPUTENEON_ENABLED)
 std::shared_ptr<arm_compute::IMemoryGroup>
 NeonMemoryManager::CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager)
 {
@@ -97,7 +97,7 @@
 }
 #endif
 
-#ifdef ARMCOMPUTECL_ENABLED
+#if defined(ARMCOMPUTECL_ENABLED)
 std::shared_ptr<arm_compute::IMemoryGroup>
 ClMemoryManager::CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager)
 {