commit 01c9151e995adbce540336e8b5835ab903d22870
author Matteo Martincigh <matteo.martincigh@arm.com> Thu Jan 31 15:40:08 2019 +0000
committer Matteo Martincigh <matteo.martincigh@arm.com> Thu Jan 31 16:05:28 2019 +0000
tree 7ebc3361fe5303f6609344d7142ff4b3b52054ff
parent 2036f85c81840ce9b222a3651fcc0cc330890133

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

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

ArmnnDevice.cpp

diff --git a/ArmnnDevice.cpp b/ArmnnDevice.cpp
index ff01701..b807cfa 100644
--- a/ArmnnDevice.cpp
+++ b/ArmnnDevice.cpp
@@ -35,6 +35,7 @@
         SetMinimumLogSeverity(base::INFO);
     }
 
+#if defined(ARMCOMPUTECL_ENABLED)
     try
     {
         armnn::IRuntime::CreationOptions options;
@@ -62,6 +63,7 @@
     {
         ALOGE("ArmnnDevice: Failed to setup CL runtime: %s. Device will be unavailable.", error.what());
     }
+#endif
 }
 
 } // namespace armnn_driver