commit d6539c58519962acd8967e93ceb2da049631c832
author Sadik Armagan <sadik.armagan@arm.com> Wed May 22 18:00:30 2019 +0100
committer Sadik Armagan <sadik.armagan@arm.com> Wed May 22 18:00:30 2019 +0100
tree fc1a324e5b2a757d6b9e26a721db362988c93dfe
parent ef08a1179a707f4d93616403c2c6e0d143f71351

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/Mean.cpp

diff --git a/test/1.1/Mean.cpp b/test/1.1/Mean.cpp
index 4ebb8cf..7d48243 100644
--- a/test/1.1/Mean.cpp
+++ b/test/1.1/Mean.cpp
@@ -32,7 +32,7 @@
 
     V1_1::Model model = {};
     AddInputOperand (model, input.GetDimensions());
-    AddTensorOperand(model, axisDimensions, const_cast<int32_t*>(axisValues), OperandType::TENSOR_INT32);
+    AddTensorOperand(model, axisDimensions, const_cast<int32_t*>(axisValues), V1_0::OperandType::TENSOR_INT32);
     AddIntOperand   (model, keepDims);
     AddOutputOperand(model, expectedOutput.GetDimensions());
 
@@ -42,7 +42,7 @@
     model.operations[0].outputs            = hidl_vec<uint32_t>{ 3 };
     model.relaxComputationFloat32toFloat16 = fp16Enabled;
 
-    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
     DataLocation inLoc    = {};