commit abc95d04dfb2462ffb42bc1facde4f45ecc65319
author Kevin May <kevin.may@arm.com> Fri May 15 15:34:03 2020 +0100
committer Kevin May <kevin.may@arm.com> Fri May 15 15:12:24 2020 +0000
tree 3c90cb117cd048a4c4742e3d0929b76b7ad640df
parent be6b3c292dee16d69ed1849f7cfb3febd4568ee3

IVGCVSW-4837 Add driver service name command line option

* revert commit 8a510e8e9ed22ec0bbd295b69a6700ad0ba7cfd8
* Add driver option to give service a name, default to "armnn"

Change-Id: I9755206494f637bee4c8299bf6370fc4731638c8
Signed-off-by: Kevin May <kevin.may@arm.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index 034495b..bf8bc65 100644
--- a/Android.mk
+++ b/Android.mk
@@ -546,12 +546,12 @@
 endif # PLATFORM_VERSION == R
 
 #####################################################
-# android.hardware.neuralnetworks@1.0-service-arm-armnn #
+# android.hardware.neuralnetworks@1.0-service-armnn #
 #####################################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := android.hardware.neuralnetworks@1.0-service-arm-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.0-service-arm-armnn.rc
+LOCAL_MODULE := android.hardware.neuralnetworks@1.0-service-armnn
+LOCAL_INIT_RC := android.hardware.neuralnetworks@1.0-service-armnn.rc
 ifeq ($(Q_OR_LATER),1)
 # "eng" is deprecated in Android Q
 LOCAL_MODULE_TAGS := optional
@@ -650,12 +650,12 @@
 # The following target is available starting from Android P
 
 #####################################################
-# android.hardware.neuralnetworks@1.1-service-arm-armnn #
+# android.hardware.neuralnetworks@1.1-service-armnn #
 #####################################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := android.hardware.neuralnetworks@1.1-service-arm-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.1-service-arm-armnn.rc
+LOCAL_MODULE := android.hardware.neuralnetworks@1.1-service-armnn
+LOCAL_INIT_RC := android.hardware.neuralnetworks@1.1-service-armnn.rc
 ifeq ($(Q_OR_LATER),1)
 # "eng" is deprecated in Android Q
 LOCAL_MODULE_TAGS := optional
@@ -751,12 +751,12 @@
 # The following target is available starting from Android Q
 
 #####################################################
-# android.hardware.neuralnetworks@1.2-service-arm-armnn #
+# android.hardware.neuralnetworks@1.2-service-armnn #
 #####################################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := android.hardware.neuralnetworks@1.2-service-arm-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.2-service-arm-armnn.rc
+LOCAL_MODULE := android.hardware.neuralnetworks@1.2-service-armnn
+LOCAL_INIT_RC := android.hardware.neuralnetworks@1.2-service-armnn.rc
 LOCAL_MODULE_TAGS := optional
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_RELATIVE_PATH := hw
@@ -839,12 +839,12 @@
 # The following target is available starting from Android R
 
 #####################################################
-# android.hardware.neuralnetworks@1.3-service-arm-armnn #
+# android.hardware.neuralnetworks@1.3-service-armnn #
 #####################################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := android.hardware.neuralnetworks@1.3-service-arm-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.3-service-arm-armnn.rc
+LOCAL_MODULE := android.hardware.neuralnetworks@1.3-service-armnn
+LOCAL_INIT_RC := android.hardware.neuralnetworks@1.3-service-armnn.rc
 LOCAL_MODULE_TAGS := optional
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_RELATIVE_PATH := hw