IVGCVSW-6758 Update SL AOSP repos to use SHA's from master 25/03/22

* Add new SHA's from master 25/03/2 to clone script
* Fix changed AOSP paths in CMakelists
* Add new aosp/external dependencies in CMakeLists
* Update functions with FL8 parameters hints and extensionNameAndPrefix
* Update sharedHandle which changed from having pointer
* Fix broken NeuralNetwork patch after pulling on aosp master

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

1 files changed, 10 insertions, 10 deletions

diff --git a/shim/sl/canonical/ArmnnDriver.hpp b/shim/sl/canonical/ArmnnDriver.hpp
index 6c8acd60c5..c42ffa20b5 100644
--- a/shim/sl/canonical/ArmnnDriver.hpp
+++ b/shim/sl/canonical/ArmnnDriver.hpp
@@ -22,7 +22,6 @@
 #include "ModelToINetworkTransformer.hpp"
 
 #include <log/log.h>
-
 namespace armnn_driver
 {
 
@@ -67,8 +66,7 @@ public:
     Version getFeatureLevel() const override
     {
         VLOG(DRIVER) << "ArmnnDriver::getFeatureLevel()";
-        // return kVersionFeatureLevel5;
-        return Version::ANDROID_S;
+        return kVersionFeatureLevel5;
     }
 
     DeviceType getType() const override
@@ -175,12 +173,14 @@ public:
     }
 
     GeneralResult<SharedPreparedModel> prepareModel(const Model& model,
-                                                    ExecutionPreference preference,
-                                                    Priority priority,
-                                                    OptionalTimePoint deadline,
-                                                    const std::vector<SharedHandle>& modelCache,
-                                                    const std::vector<SharedHandle>& dataCache,
-                                                    const CacheToken& token) const override
+        ExecutionPreference preference,
+        Priority priority,
+        OptionalTimePoint deadline,
+        const std::vector<SharedHandle>& modelCache,
+        const std::vector<SharedHandle>& dataCache,
+        const CacheToken& token,
+        const std::vector<android::nn::TokenValuePair>& hints,
+        const std::vector<android::nn::ExtensionNameAndPrefix>& extensionNameToPrefix) const override
     {
         VLOG(DRIVER) << "ArmnnDriver::prepareModel()";
 
@@ -240,7 +240,7 @@ public:
                                          const std::vector<BufferRole>&) const override
     {
         VLOG(DRIVER) << "ArmnnDriver::allocate()";
-        return NN_ERROR(ErrorStatus::GENERAL_FAILURE) << "ArmnnDriver::allocate -- does not support allocate.";
+        return NN_ERROR(ErrorStatus::INVALID_ARGUMENT) << "ArmnnDriver::allocate -- does not support allocate.";
     }
 };