commit 4b1c75d7381df4ab68f2634cbc13bcf83d6bf5fe
author Nicolas Geoffray <ngeoffray@google.com> Fri Sep 14 13:41:57 2018 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Fri Sep 14 14:41:12 2018 +0100
tree e7ff9d7e0b743daae3f6272df04cd79dbcb71717
parent 7dca45b9677c16a54347cdc0d08bfa2bdd94b464

Add a --toybox-path option to the art script.

Useful for devices that don't have the utilities required by
the script.

Test: art --toybox-path=/data/local/tmp/toybox on nexus5
Change-Id: Ib47219f50b18d1cba0f3faa844f4688824388bc4

tools/art

diff --git a/tools/art b/tools/art
old mode 100644
new mode 100755
index fbc7992..574ae35
--- a/tools/art
+++ b/tools/art
@@ -50,6 +50,9 @@
   --verbose                Run script verbosely.
   --no-clean               Don't cleanup oat directories.
   --no-compile             Don't invoke dex2oat before running.
+  --toybox-path <path>     Path for toybox executable. Provide this
+                           path if your device does not have
+                           'env', 'rm', 'dirname', 'basename', or 'mkdir'.
   --allow-default-jdwp     Don't automatically put in -XjdwpProvider:none.
                            You probably do not want this.
 
@@ -68,7 +71,7 @@
 
 function clean_android_data() {
   if [ "$DELETE_ANDROID_DATA" = "yes" ]; then
-    rm -rf $ANDROID_DATA
+    $TOYBOX rm -rf $ANDROID_DATA
   fi
 }
 
@@ -81,7 +84,7 @@
     echo "$@"
   fi
 
-  env "$@"
+  $TOYBOX env "$@"
 }
 
 # Parse a colon-separated list into an array (e.g. "foo.dex:bar.dex" -> (foo.dex bar.dex))
@@ -131,8 +134,8 @@
   local dirpath
 
   for path in "${classpath[@]}"; do
-    dirpath="$(dirname "$path")"
-    [[ -d "$dirpath" ]] && verbose_run rm -rf "$dirpath/oat"
+    dirpath="$($TOYBOX dirname "$path")"
+    [[ -d "$dirpath" ]] && verbose_run $TOYBOX rm -rf "$dirpath/oat"
   done
 }
 
@@ -192,9 +195,9 @@
       dex_file="$(readlink "$dex_file")"
     done
     # Create oat file directory.
-    verbose_run mkdir -p $(dirname "$dex_file")/oat/$ISA
-    local oat_file=$(basename "$dex_file")
-    local oat_file=$(dirname "$dex_file")/oat/$ISA/${oat_file%.*}.odex
+    verbose_run $TOYBOX mkdir -p $($TOYBOX dirname "$dex_file")/oat/$ISA
+    local oat_file=$($TOYBOX basename "$dex_file")
+    local oat_file=$($TOYBOX dirname "$dex_file")/oat/$ISA/${oat_file%.*}.odex
     # When running dex2oat use the exact same context as when running dalvikvm.
     # (see run_art function)
     verbose_run ANDROID_DATA=$ANDROID_DATA                    \
@@ -295,6 +298,7 @@
 EXTRA_OPTIONS=()
 DEX2OAT_FLAGS=()
 DEX2OAT_CLASSPATH=()
+TOYBOX=
 
 # Parse arguments
 while [[ "$1" = "-"* ]]; do
@@ -356,6 +360,10 @@
   --allow-default-jdwp)
     ALLOW_DEFAULT_JDWP="yes"
     ;;
+  --toybox-path)
+    TOYBOX=$2
+    shift
+    ;;
   --*)
     echo "unknown option: $1" 1>&2
     usage
@@ -433,7 +441,7 @@
     # by default.
     ANDROID_DATA="$ANDROID_DATA/local/tmp/android-data$$"
   fi
-  mkdir -p "$ANDROID_DATA"
+  $TOYBOX mkdir -p "$ANDROID_DATA"
   DELETE_ANDROID_DATA="yes"
 fi
 
@@ -479,7 +487,7 @@
 
   # Wipe dalvik-cache so that a subsequent run_art must regenerate it.
   # Leave $ANDROID_DATA intact since it contains our profile file.
-  rm -rf "$ANDROID_DATA/dalvik-cache"
+  $TOYBOX rm -rf "$ANDROID_DATA/dalvik-cache"
 
   # Append arguments so next invocation of run_art uses the profile.
   DEX2OAT_FLAGS+=(--profile-file="$PROFILE_PATH")