From b0717b5241a15e3e4d37a1b51b6e5fd9a92a664f Mon Sep 17 00:00:00 2001
From: arovir01 <Aron.Virginas-Tar@arm.com>
Date: Wed, 5 Sep 2018 17:03:25 +0100
Subject: IVGCVSW-1806: Refactor Android-NN-Driver ModelToINetworkConverter

* Moved conversion logic into new V1_0 and V1_1 HalPolicy classes
* Extracted common helper functions into ConversionUtils class

Change-Id: I1ab50edc266dd528c0cb22a5cd1aa65e103674d9
---
 Android.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index bcfa4479..f9d59c83 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,13 +48,15 @@ endif # ARMNN_DRIVER_DEBUG == 1
 
 LOCAL_SRC_FILES := \
         1.0/ArmnnDriverImpl.cpp \
+        1.0/HalPolicy.cpp \
         ArmnnDriverImpl.cpp \
         DriverOptions.cpp \
         ArmnnDevice.cpp \
         ArmnnPreparedModel.cpp \
         ModelToINetworkConverter.cpp \
         RequestThread.cpp \
-        Utils.cpp
+        Utils.cpp \
+        ConversionUtils.cpp
 
 LOCAL_STATIC_LIBRARIES := \
         libneuralnetworks_common \
@@ -120,14 +122,17 @@ endif # ARMNN_DRIVER_DEBUG == 1
 
 LOCAL_SRC_FILES := \
         1.0/ArmnnDriverImpl.cpp \
+        1.0/HalPolicy.cpp \
         1.1/ArmnnDriverImpl.cpp \
+        1.1/HalPolicy.cpp \
         ArmnnDriverImpl.cpp \
         DriverOptions.cpp \
         ArmnnDevice.cpp \
         ArmnnPreparedModel.cpp \
         ModelToINetworkConverter.cpp \
         RequestThread.cpp \
-        Utils.cpp
+        Utils.cpp \
+        ConversionUtils.cpp
 
 LOCAL_STATIC_LIBRARIES := \
         libneuralnetworks_common \
-- 
cgit v1.2.1