commit e48bdff741568236d3c0747ad3d18a8eba5b36dd
author Matteo Martincigh <matteo.martincigh@arm.com> Mon Sep 03 13:50:50 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Tue Sep 18 12:40:38 2018 +0100
tree 77aabce6f75d86d3f2f3924f342292ae5a7267e7
parent a15dc11fd7bf3ad49e752ec75157b731287fe46d

IVGCVSW-1806 Refactored Android-NN-Driver, added common "getCapabilities",
"getSupportedOperations" and "prepareModel" implementations

 * Added common base ArmnnDriverImpl class
 * Added common template implementation of the driver's "getCapabilities",
   "getSupportedOperations" and "prepareModel" methods
 * Refactored ArmnnPreparedModel and RequestThread to support HAL
   v1.1 models
 * Moved "getStatus" to the common base class, as it is shared by both
   HAL implementations
 * Refactored the code where necessary

Change-Id: I747334730026d63b4002662523fb93608f67c899

Android.mk

diff --git a/Android.mk b/Android.mk
index 960a2f6..3845070 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,7 +47,7 @@
 endif # ARMNN_DRIVER_DEBUG == 1
 
 LOCAL_SRC_FILES := \
-        1.0/ArmnnDriverImpl.cpp \
+        ArmnnDriverImpl.cpp \
         DriverOptions.cpp \
         ArmnnDevice.cpp \
         ArmnnPreparedModel.cpp \
@@ -118,8 +118,7 @@
 endif # ARMNN_DRIVER_DEBUG == 1
 
 LOCAL_SRC_FILES := \
-        1.0/ArmnnDriverImpl.cpp \
-        1.1/ArmnnDriverImpl.cpp \
+        ArmnnDriverImpl.cpp \
         DriverOptions.cpp \
         ArmnnDevice.cpp \
         ArmnnPreparedModel.cpp \