commit 912b36224f19952663ebd3edc2a69d9031662fd1
author Matthew Bentham <matthew.bentham@arm.com> Fri May 03 15:49:14 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Tue May 07 07:54:08 2019 +0000
tree b84bdf384a6a9866336cfe5db7a613a4fc96d03c
parent 856d1c9c9b0b1609282c4f797cbafefc6531240d

IVGCVSW-2911 Work towards compatibility with Q

Explicitly use HAL V1_0 Operand, OperandType, and IPreparedModelCallback

Change-Id: If6aa6e9dc1bd0b7673ec247ac3560e7f072ef699
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>

1.0/ArmnnDriver.hpp

diff --git a/1.0/ArmnnDriver.hpp b/1.0/ArmnnDriver.hpp
index 52c34c4..035d448 100644
--- a/1.0/ArmnnDriver.hpp
+++ b/1.0/ArmnnDriver.hpp
@@ -47,7 +47,7 @@
     }
 
     Return<ErrorStatus> prepareModel(const V1_0::Model& model,
-                                     const android::sp<IPreparedModelCallback>& cb) override
+                                     const android::sp<V1_0::IPreparedModelCallback>& cb) override
     {
         ALOGV("hal_1_0::ArmnnDriver::prepareModel()");
 

1.0/HalPolicy.hpp

diff --git a/1.0/HalPolicy.hpp b/1.0/HalPolicy.hpp
index 484a99b..bbdf630 100644
--- a/1.0/HalPolicy.hpp
+++ b/1.0/HalPolicy.hpp
@@ -20,6 +20,8 @@
 {
 public:
     using Model                     = V1_0::Model;
+    using Operand                   = V1_0::Operand;
+    using OperandType               = V1_0::OperandType;
     using Operation                 = V1_0::Operation;
     using OperationType             = V1_0::OperationType;
     using getSupportedOperations_cb = V1_0::IDevice::getSupportedOperations_cb;