From deb3bdbe028a59da0759dd7a560387d03a11d322 Mon Sep 17 00:00:00 2001
From: surmeh01 <surabhi.mehta@arm.com>
Date: Thu, 5 Jul 2018 12:06:04 +0100
Subject: Release 18.05.02

---
 ArmnnPreparedModel.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'ArmnnPreparedModel.cpp')

diff --git a/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp
index 1bd72199..3aad955b 100644
--- a/ArmnnPreparedModel.cpp
+++ b/ArmnnPreparedModel.cpp
@@ -12,6 +12,12 @@
 #include <log/log.h>
 #include <OperationsUtils.h>
 
+#if defined(ARMNN_ANDROID_P)
+// The headers of the ML framework have changed between Android O and Android P.
+// The validation functions have been moved into their own header, ValidateHal.h.
+#include <ValidateHal.h>
+#endif
+
 #include <cassert>
 #include <cinttypes>
 
@@ -101,7 +107,7 @@ void ArmnnPreparedModel::DumpTensorsIfRequired(char const* tensorNamePrefix,
 
 ArmnnPreparedModel::ArmnnPreparedModel(armnn::NetworkId networkId,
     armnn::IRuntime* runtime,
-    const Model& model,
+    const V1_0::Model& model,
     const std::string& requestInputsAndOutputsDumpDir)
 : m_NetworkId(networkId)
 , m_Runtime(runtime)
@@ -269,7 +275,7 @@ void ArmnnPreparedModel::ExecuteWithDummyInputs()
     }
 }
 
-AndroidNnCpuExecutorPreparedModel::AndroidNnCpuExecutorPreparedModel(const Model& model,
+AndroidNnCpuExecutorPreparedModel::AndroidNnCpuExecutorPreparedModel(const V1_0::Model& model,
     const std::string& requestInputsAndOutputsDumpDir)
 : m_Model(model)
 , m_RequestInputsAndOutputsDumpDir(requestInputsAndOutputsDumpDir)
-- 
cgit v1.2.1