From 8a510e8e9ed22ec0bbd295b69a6700ad0ba7cfd8 Mon Sep 17 00:00:00 2001 From: Kevin May Date: Wed, 6 May 2020 15:28:49 +0100 Subject: IVGCVSW-4673 Change ArmNN driver service name to arm-armnn * Change service name from "armnn" to "arm-armnn" * Rename .rc files * Update Android.mk to use new service name * Update Integrator Guide Signed-off-by: Kevin May Change-Id: If2a4ac9756101472d30255afbf8c90859e29aabf --- Android.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index bf8bc65b..034495ba 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-armnn # +# android.hardware.neuralnetworks@1.0-service-arm-armnn # ##################################################### include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.neuralnetworks@1.0-service-armnn -LOCAL_INIT_RC := android.hardware.neuralnetworks@1.0-service-armnn.rc +LOCAL_MODULE := android.hardware.neuralnetworks@1.0-service-arm-armnn +LOCAL_INIT_RC := android.hardware.neuralnetworks@1.0-service-arm-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-armnn # +# android.hardware.neuralnetworks@1.1-service-arm-armnn # ##################################################### include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.neuralnetworks@1.1-service-armnn -LOCAL_INIT_RC := android.hardware.neuralnetworks@1.1-service-armnn.rc +LOCAL_MODULE := android.hardware.neuralnetworks@1.1-service-arm-armnn +LOCAL_INIT_RC := android.hardware.neuralnetworks@1.1-service-arm-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-armnn # +# android.hardware.neuralnetworks@1.2-service-arm-armnn # ##################################################### include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.neuralnetworks@1.2-service-armnn -LOCAL_INIT_RC := android.hardware.neuralnetworks@1.2-service-armnn.rc +LOCAL_MODULE := android.hardware.neuralnetworks@1.2-service-arm-armnn +LOCAL_INIT_RC := android.hardware.neuralnetworks@1.2-service-arm-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-armnn # +# android.hardware.neuralnetworks@1.3-service-arm-armnn # ##################################################### include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.neuralnetworks@1.3-service-armnn -LOCAL_INIT_RC := android.hardware.neuralnetworks@1.3-service-armnn.rc +LOCAL_MODULE := android.hardware.neuralnetworks@1.3-service-arm-armnn +LOCAL_INIT_RC := android.hardware.neuralnetworks@1.3-service-arm-armnn.rc LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE_RELATIVE_PATH := hw -- cgit v1.2.1