From d6539c58519962acd8967e93ceb2da049631c832 Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
Date: Wed, 22 May 2019 18:00:30 +0100
Subject: 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>
---
 test/1.1/Transpose.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/1.1/Transpose.cpp')

diff --git a/test/1.1/Transpose.cpp b/test/1.1/Transpose.cpp
index a0521436..6dc3e0ee 100644
--- a/test/1.1/Transpose.cpp
+++ b/test/1.1/Transpose.cpp
@@ -30,7 +30,7 @@ void TransposeTestImpl(const TestTensor & inputs, int32_t perm[],
     V1_1::Model model = {};
 
     AddInputOperand(model,inputs.GetDimensions());
-    AddTensorOperand(model, hidl_vec<uint32_t>{4}, perm, OperandType::TENSOR_INT32);
+    AddTensorOperand(model, hidl_vec<uint32_t>{4}, perm, V1_0::OperandType::TENSOR_INT32);
     AddOutputOperand(model, expectedOutputTensor.GetDimensions());
 
     model.operations.resize(1);
@@ -38,7 +38,7 @@ void TransposeTestImpl(const TestTensor & inputs, int32_t perm[],
     model.operations[0].inputs  = hidl_vec<uint32_t>{0, 1};
     model.operations[0].outputs = hidl_vec<uint32_t>{2};
 
-    android::sp<IPreparedModel> preparedModel = PrepareModel(model, *driver);
+    android::sp<V1_0::IPreparedModel> preparedModel = PrepareModel(model, *driver);
 
     // the request's memory pools will follow the same order as
     // the inputs
-- 
cgit v1.2.1