commit b0717b5241a15e3e4d37a1b51b6e5fd9a92a664f
author arovir01 <Aron.Virginas-Tar@arm.com> Wed Sep 05 17:03:25 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Tue Sep 18 12:40:40 2018 +0100
tree 84159d2eb142f12081c494483c07012e8ebee8cb
parent 93e48980920ddcc8c6390fa6cbfdfc9740786617

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

diff --git a/Android.mk b/Android.mk
index bcfa447..f9d59c8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,13 +48,15 @@
 
 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 @@
 
 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 \