aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorKevin May <kevin.may@arm.com>2020-05-15 15:34:03 +0100
committerKevin May <kevin.may@arm.com>2020-05-15 15:12:24 +0000
commitabc95d04dfb2462ffb42bc1facde4f45ecc65319 (patch)
tree3c90cb117cd048a4c4742e3d0929b76b7ad640df /Android.mk
parentbe6b3c292dee16d69ed1849f7cfb3febd4568ee3 (diff)
downloadandroid-nn-driver-abc95d04dfb2462ffb42bc1facde4f45ecc65319.tar.gz
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>
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk24
1 files changed, 12 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk
index 034495ba..bf8bc65b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -546,12 +546,12 @@ include $(BUILD_STATIC_LIBRARY)
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 @@ ifeq ($(P_OR_LATER),1)
# 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 @@ ifeq ($(Q_OR_LATER),1)
# 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 @@ ifeq ($(R_OR_LATER),1)
# 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