IVGCVSW-2911 Add Android Q support to android-nn-driver infrastructure

 * Updated Android.mk to build Android Q
 * Added androidnn.go to inject cpp flags for Q
 * Create Runtime when ACL is not enabled

Change-Id: Ia3e7a8e484fc81ce63998a65e29753cbf941173c
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Kevin May <kevin.may@arm.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/Utils.hpp b/Utils.hpp
index e55d8f80..42fef3fb 100644
--- a/Utils.hpp
+++ b/Utils.hpp
@@ -29,12 +29,12 @@ extern const armnn::PermutationVector g_DontPermute;
 class UnsupportedOperand: public std::runtime_error
 {
 public:
-    UnsupportedOperand(const OperandType type)
+    UnsupportedOperand(const V1_0::OperandType type)
         : std::runtime_error("Operand type is unsupported")
         , m_type(type)
     {}
 
-    OperandType m_type;
+    V1_0::OperandType m_type;
 };
 
 /// Swizzles tensor data in @a input according to the dimension mappings.