commit ad37530970507540e50aef24a46bb5720b5a90f2
author Cathal Corbett <cathal.corbett@arm.com> Mon Mar 11 11:59:54 2024 +0000
committer Cathal Corbett <cathal.corbett@arm.com> Mon Mar 11 11:59:54 2024 +0000
tree 3463d994cc53420d7c332603848b9daf2d22ab9e
parent 5cc8e447a63d9eb32f0e5ab6c66e755a52fc584d

MLCE-1229 ArmNN build tool script update for delegate header and so files.

Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I5366d7cf6b427227180dae5716aa4efe59360377

build-tool/scripts/build-armnn.sh

diff --git a/build-tool/scripts/build-armnn.sh b/build-tool/scripts/build-armnn.sh
index 5bc8d69..d9e89a2 100755
--- a/build-tool/scripts/build-armnn.sh
+++ b/build-tool/scripts/build-armnn.sh
@@ -213,11 +213,25 @@
   rm -rf include
   cp -r "$SOURCE_DIR"/armnn/include .
 
+  if [ "$flag_tflite_classic_delegate" -eq 1 ] || [ "$flag_tflite_opaque_delegate" -eq 1 ]; then
+    mv delegate/libarmnn* .  # move .so files to outer directory
+    mv delegate/*UnitTests . # move UnitTest files to outer directory
+    rm -rf delegate
+
+    mkdir -p ./include/armnnDelegate/
+    cp -r "$SOURCE_DIR"/armnn/delegate/include/* ./include/armnnDelegate/
+
+    mkdir -p ./include/armnnDelegate/armnn/delegate/common/
+    cp -r "$SOURCE_DIR"/armnn/delegate/common/include ./include/armnnDelegate/armnn/delegate/common/
+  fi
+
   if [ "$flag_tflite_classic_delegate" -eq 1 ]; then
-    cp -r "$SOURCE_DIR"/armnn/delegate/classic/include ./delegate/classic/
+    mkdir -p ./include/armnnDelegate/armnn/delegate/classic/
+    cp -r "$SOURCE_DIR"/armnn/delegate/classic/include ./include/armnnDelegate/armnn/delegate/classic/
   fi
   if [ "$flag_tflite_opaque_delegate" -eq 1 ]; then
-    cp -r "$SOURCE_DIR"/armnn/delegate/opaque/include ./delegate/opaque/
+    mkdir -p ./include/armnnDelegate/armnn/delegate/opaque/
+    cp -r "$SOURCE_DIR"/armnn/delegate/opaque/include ./include/armnnDelegate/armnn/delegate/opaque/
   fi
 
   echo -e "\n***** Built Arm NN for $TARGET_ARCH *****"
@@ -581,9 +595,6 @@
 fi
 echo "        build directory: $BUILD_DIR"
 echo "        armnn build dir: $ARMNN_BUILD_TARGET"
-echo -e "\nScript execution will begin in 10 seconds..."
-
-sleep 10
 
 if [ "$flag_neon_backend" -eq 1 ] || [ "$flag_cl_backend" -eq 1 ]; then
   build_acl