IVGCVSW-7423 Add ArmnnDelegatePlugin

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Signed-off-by: Ryan OShea <ryan.oshea3@arm.com>
Change-Id: Ie02021ac56a512598760e4c6d05ef1a80f4aec8d
diff --git a/delegate/opaque/src/armnn_delegate.cpp b/delegate/opaque/src/armnn_delegate.cpp
index fa64679..8cdf01f 100644
--- a/delegate/opaque/src/armnn_delegate.cpp
+++ b/delegate/opaque/src/armnn_delegate.cpp
@@ -62,11 +62,15 @@
 const TfLiteStableDelegate TFL_TheStableDelegate =
 {
     /*delegate_abi_version=*/ TFL_STABLE_DELEGATE_ABI_VERSION,
-    /*delegate_name=*/        "ArmnnDelegatePlugin",
-    /*delegate_version=*/     "1.0.0",
+    /*delegate_name=*/        "armnn_delegate",
+    /*delegate_version=*/     OPAQUE_DELEGATE_VERSION,
     /*delegate_plugin=*/      GetArmnnDelegatePluginApi()
 };
 
+static auto* g_delegate_plugin_ArmnnDelegatePlugin_ =
+    new tflite::delegates::DelegatePluginRegistry::Register(TFL_TheStableDelegate.delegate_name,
+                                                            ArmnnDelegatePlugin::New);
+
 ArmnnOpaqueDelegate::ArmnnOpaqueDelegate(armnnDelegate::DelegateOptions options)
     : m_Options(std::move(options))
 {
@@ -121,7 +125,9 @@
 
     // ArmNN Opaque Delegate Registration
     TfLiteRegistrationExternal* kernelRegistration =
-            TfLiteRegistrationExternalCreate(kTfLiteBuiltinDelegate, "TfLiteArmNNOpaqueDelegate", /*version=*/1);
+            TfLiteRegistrationExternalCreate(kTfLiteBuiltinDelegate,
+                                             TFL_TheStableDelegate.delegate_name,
+                                             /*version=*/OPAQUE_DELEGATE_MAJOR_VERSION);
     if(kernelRegistration == nullptr)
     {
         return kTfLiteError;