aboutsummaryrefslogtreecommitdiff
path: root/1.0
diff options
context:
space:
mode:
authorMatthew Bentham <matthew.bentham@arm.com>2019-05-03 15:49:14 +0100
committerMatteo Martincigh <matteo.martincigh@arm.com>2019-05-07 07:54:08 +0000
commit912b36224f19952663ebd3edc2a69d9031662fd1 (patch)
treeb84bdf384a6a9866336cfe5db7a613a4fc96d03c /1.0
parent856d1c9c9b0b1609282c4f797cbafefc6531240d (diff)
downloadandroid-nn-driver-912b36224f19952663ebd3edc2a69d9031662fd1.tar.gz
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>
Diffstat (limited to '1.0')
-rw-r--r--1.0/ArmnnDriver.hpp2
-rw-r--r--1.0/HalPolicy.hpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/1.0/ArmnnDriver.hpp b/1.0/ArmnnDriver.hpp
index 52c34c46..035d4484 100644
--- a/1.0/ArmnnDriver.hpp
+++ b/1.0/ArmnnDriver.hpp
@@ -47,7 +47,7 @@ public:
}
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()");
diff --git a/1.0/HalPolicy.hpp b/1.0/HalPolicy.hpp
index 484a99b2..bbdf630b 100644
--- a/1.0/HalPolicy.hpp
+++ b/1.0/HalPolicy.hpp
@@ -20,6 +20,8 @@ class HalPolicy
{
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;