From e48bdff741568236d3c0747ad3d18a8eba5b36dd Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Mon, 3 Sep 2018 13:50:50 +0100 Subject: 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 960a2f6e..38450705 100644 --- a/Android.mk +++ b/Android.mk @@ -47,7 +47,7 @@ LOCAL_CFLAGS+= \ endif # ARMNN_DRIVER_DEBUG == 1 LOCAL_SRC_FILES := \ - 1.0/ArmnnDriverImpl.cpp \ + ArmnnDriverImpl.cpp \ DriverOptions.cpp \ ArmnnDevice.cpp \ ArmnnPreparedModel.cpp \ @@ -118,8 +118,7 @@ LOCAL_CFLAGS+= \ endif # ARMNN_DRIVER_DEBUG == 1 LOCAL_SRC_FILES := \ - 1.0/ArmnnDriverImpl.cpp \ - 1.1/ArmnnDriverImpl.cpp \ + ArmnnDriverImpl.cpp \ DriverOptions.cpp \ ArmnnDevice.cpp \ ArmnnPreparedModel.cpp \ -- cgit v1.2.1