commit 94c6b4468836613e5b2640dd636260f27500e8b7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jul 26 00:31:39 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 26 00:31:39 2024 +0000
tree 93f2546cc12ad9211a6fad1ab00d824706b3c062
parent 04dbebc08fa0c7e6641979db1b2a9011d5f60737
parent a2f2e80c08c6951ff7285795f813307681b8d364

Merge "Fix mistake made when moving installmod from shell function standalone script" into main am: a2f2e80c08

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3196892

Change-Id: If9aa9ac2ecc3c02ae5a112dace4188c2dfd2eaa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bin/installmod

diff --git a/bin/installmod b/bin/installmod
index 1d0d836..1ad5b84 100755
--- a/bin/installmod
+++ b/bin/installmod
@@ -28,7 +28,6 @@
     return 1
 fi
 
-local _path
 _path=$(outmod ${@:$#:1})
 if [ $? -ne 0 ]; then
     return 1
@@ -39,7 +38,7 @@
     echo "Module '$1' does not produce a file ending with .apk (try 'refreshmod' if there have been build changes?)" >&2
     return 1
 fi
-local serial_device=""
+serial_device=""
 if [[ "$1" == "-s" ]]; then
     if [[ $# -le 2 ]]; then
         echo "-s requires an argument" >&2
@@ -48,7 +47,7 @@
     serial_device="-s $2"
     shift 2
 fi
-local length=$(( $# - 1 ))
+length=$(( $# - 1 ))
 echo adb $serial_device install ${@:1:$length} $_path
 adb $serial_device install ${@:1:$length} $_path