From 01c9151e995adbce540336e8b5835ab903d22870 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Thu, 31 Jan 2019 15:40:08 +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 Change-Id: I06e71c352bb9d7048bc439e5c8ccac0a9c2bb47b Signed-off-by: Matteo Martincigh --- ArmnnDevice.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ArmnnDevice.cpp') diff --git a/ArmnnDevice.cpp b/ArmnnDevice.cpp index ff017019..b807cfa9 100644 --- a/ArmnnDevice.cpp +++ b/ArmnnDevice.cpp @@ -35,6 +35,7 @@ ArmnnDevice::ArmnnDevice(DriverOptions options) SetMinimumLogSeverity(base::INFO); } +#if defined(ARMCOMPUTECL_ENABLED) try { armnn::IRuntime::CreationOptions options; @@ -62,6 +63,7 @@ ArmnnDevice::ArmnnDevice(DriverOptions options) { ALOGE("ArmnnDevice: Failed to setup CL runtime: %s. Device will be unavailable.", error.what()); } +#endif } } // namespace armnn_driver -- cgit v1.2.1