commit 8b287c23f5141102555ba869a34397ec720a3e4f
author Matteo Martincigh <matteo.martincigh@arm.com> Fri Sep 07 09:25:10 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Tue Sep 18 12:40:42 2018 +0100
tree 4a60d9c806669aad06816414601ac532946d6878
parent 77605826a353981d41f0ee346850d411770535f8

IVGCVSW-1806 More Android NN Driver refactoring

 * Changed #if defined to #ifdef
 * Simplified the Android ML namespace resolution
 * Fixed the relative path in some include directives

Change-Id: I46e46faff98559c8042c1a4b8b82007f462df57d

ArmnnDriver.hpp

diff --git a/ArmnnDriver.hpp b/ArmnnDriver.hpp
index fd5cfad..7c6e5d0 100644
--- a/ArmnnDriver.hpp
+++ b/ArmnnDriver.hpp
@@ -9,7 +9,7 @@
 
 #include <log/log.h>
 
-#if defined(ARMNN_ANDROID_NN_V1_1)
+#ifdef ARMNN_ANDROID_NN_V1_1 // Using ::android::hardware::neuralnetworks::V1_1
 
 #include "1.1/ArmnnDriver.hpp"
 
@@ -29,7 +29,7 @@
 
 } // namespace armnn_driver
 
-#else // Fallback to ::android::hardware::neuralnetworks::V1_0.
+#else // Fallback to ::android::hardware::neuralnetworks::V1_0
 
 #include "1.0/ArmnnDriver.hpp"