From d95e906f135ab9c7a7ac4c9f5d2cef8beb154a88 Mon Sep 17 00:00:00 2001
From: Matteo Martincigh <matteo.martincigh@arm.com>
Date: Thu, 31 Jan 2019 15:35:59 +0000
Subject: 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/backends/aclCommon/BaseMemoryManager.cpp')

diff --git a/src/backends/aclCommon/BaseMemoryManager.cpp b/src/backends/aclCommon/BaseMemoryManager.cpp
index f564dc63e2..7c06ec5537 100644
--- a/src/backends/aclCommon/BaseMemoryManager.cpp
+++ b/src/backends/aclCommon/BaseMemoryManager.cpp
@@ -89,7 +89,7 @@ void BaseMemoryManager::Release()
 }
 #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 @@ NeonMemoryManager::CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryMa
 }
 #endif
 
-#ifdef ARMCOMPUTECL_ENABLED
+#if defined(ARMCOMPUTECL_ENABLED)
 std::shared_ptr<arm_compute::IMemoryGroup>
 ClMemoryManager::CreateMemoryGroup(const std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager)
 {
-- 
cgit v1.2.1