commit 17086a7da9a3d85ddcd4352f8e4906f02dbf4469
author Nikhil Raj <nikhil.raj@arm.com> Tue May 02 16:46:35 2023 +0100
committer Nikhil Raj <nikhil.raj@arm.com> Wed May 03 17:08:36 2023 +0100
tree 7ba6bc5af8ee87338571b0f0fd2d4224181b4d2c
parent 365fa4b4b96204254a04a22ba7cb2aaec2935246

Minor fixes to the build android ndk guide script

* Aligns both sh script and md file
* Change default branch to main as 'latest' release will change every 3 month
* Clones github repos instead of mlplatform repos

Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: I4bed6c4c231b5f3bab0abf92b0febf825ddb4ce7

scripts/build_android_ndk_guide.sh

diff --git a/scripts/build_android_ndk_guide.sh b/scripts/build_android_ndk_guide.sh
index 7f76218..66ba282 100755
--- a/scripts/build_android_ndk_guide.sh
+++ b/scripts/build_android_ndk_guide.sh
@@ -13,8 +13,8 @@
   echo "Options:"
   echo "    -l Use this copy of Arm NN and ComputeLibrary instead of cloning new copies"
   echo "       <1 or 0> defaults to 1"
-  echo "    -a Override Arm NN branch (defaults to latest release branches/armnn_23_02)"
-  echo "    -b Override ACL branch (defaults to latest release v23.02)"
+  echo "    -a Override Arm NN branch (defaults to main branch). For example to use 23.02 release use branch name branches/armnn_23_02"
+  echo "    -b Override ACL branch (defaults to main branch). For example to use 23.02 release use tag v23.02"
   echo "    -A Android API level defaults to 30"
   echo "    -n Neon (CpuAcc backend) enabled <1 or 0> defaults to 1"
   echo "    -g CL (GpuAcc backend) enabled <1 or 0> defaults to 1"
@@ -42,8 +42,8 @@
 
 # Set variables and working directory
 CREATE_LINKS=1
-ARMNN_BRANCH=branches/armnn_23_02
-ACL_BRANCH=v23.02
+ARMNN_BRANCH=main
+ACL_BRANCH=main
 ACL_NEON=1
 ACL_CL=1
 REFERENCE=1
@@ -164,17 +164,22 @@
     cd $WORKING_DIR
 
     if [[ ! -d armnn ]]; then
-        if [[ $CREATE_LINKS = 1  && -d $BASE_DIR/../../armnn ]]; then
-            echo "+++ Linking Arm NN"
-            ln -s $BASE_DIR/../../armnn $WORKING_DIR/armnn
+        if [[ $CREATE_LINKS = 1 ]]; then
+            if [[ -d $BASE_DIR/../../armnn ]]; then
+                echo "+++ Linking Arm NN"
+                echo "$BASE_DIR"
+               ln -s $BASE_DIR/../../armnn $WORKING_DIR/armnn
+           else
+               echo "Couldn't find Arm NN to link"
+           fi
         else
             echo "+++ Cloning Arm NN"
-            git clone https://review.mlplatform.org/ml/armnn.git armnn
+            git clone https://github.com/ARM-software/armnn.git armnn
             cd armnn
 
             git checkout $ARMNN_BRANCH
             git log -1
-        fi
+       fi
     fi
 }
 
@@ -188,7 +193,7 @@
                 ln -s $BASE_DIR/../../ComputeLibrary $WORKING_DIR/ComputeLibrary
             else
                 echo "+++ Cloning ComputeLibrary"
-                git clone https://review.mlplatform.org/ml/ComputeLibrary.git ComputeLibrary
+                git clone https://github.com/ARM-software/ComputeLibrary.git ComputeLibrary
                 cd ComputeLibrary
                 git checkout $($BASE_DIR/../../armnn/scripts/get_compute_library.sh -p)
                 git log -1
@@ -196,7 +201,7 @@
         else
             echo "+++ Cloning ComputeLibrary"
 
-            git clone https://review.mlplatform.org/ml/ComputeLibrary.git ComputeLibrary
+            git clone https://github.com/ARM-software/ComputeLibrary.git ComputeLibrary
             cd ComputeLibrary
             git checkout $ACL_BRANCH
             git log -1