From ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c Mon Sep 17 00:00:00 2001
From: Kevin May <kevin.may@arm.com>
Date: Wed, 26 Feb 2020 17:00:39 +0000
Subject: IVGCVSW-4473 Android R pre Hal 1_3 build changes

* Update ErrorStatus to V1_0::ErrorStatus
* Update Request to V1_0::Request
* Update OperandType to V1_2::OperandType
* Add namespace android::nn::hal in ArmnnDriverImpl for R only
* Add missing g_RelaxedFloat32toFloat16PerformancePowerUsageName
* Add namespace V1_0 or V1_1 where necessary
* Update Android.mk with R macro and android.hardware.neuralnetworks@1.3
* Remove androidnn.go
* include IAllocator in DriverTestHelpers
* Remove unused LOCAL_CFLAGS

Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I1787f1ed6784b3bbec017536d87d49197405e853
Signed-off-by: Kevin May <kevin.may@arm.com>
---
 Utils.hpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Utils.hpp')

diff --git a/Utils.hpp b/Utils.hpp
index c5a2e650..6256655f 100644
--- a/Utils.hpp
+++ b/Utils.hpp
@@ -27,6 +27,10 @@ namespace V1_2 = ::android::hardware::neuralnetworks::V1_2;
 namespace armnn_driver
 {
 
+#ifdef ARMNN_ANDROID_R
+using DataLocation = ::android::nn::hal::DataLocation;
+#endif
+
 extern const armnn::PermutationVector g_DontPermute;
 
 template <typename OperandType>
-- 
cgit v1.2.1