Fix d8 and r8-compat-proguard scripts to handle quoted options.HEADq10.0

Bug: 132766811
Test: treehugger
Change-Id: I298a17e9a80be79b1a884dc42c8d542bd1c47325

2 files changed, 8 insertions, 8 deletions

diff --git a/d8 b/d8
index e8fbac5..3a1fe80 100755
--- a/d8
+++ b/d8
@@ -64,11 +64,11 @@ defaultMx="-Xmx2G"
 # example. "java" (with no args) and "java -X" give a summary of
 # available options.
 
-javaOpts=""
+declare -a javaOpts=()
 
 while expr "x$1" : 'x-J' >/dev/null; do
     opt=`expr "x$1" : 'x-J\(.*\)'`
-    javaOpts="${javaOpts} -${opt}"
+    javaOpts+=("-${opt}")
     if expr "x${opt}" : "xXmx[0-9]" >/dev/null; then
         defaultMx="no"
     fi
@@ -76,7 +76,7 @@ while expr "x$1" : 'x-J' >/dev/null; do
 done
 
 if [ "${defaultMx}" != "no" ]; then
-    javaOpts="${javaOpts} ${defaultMx}"
+    javaOpts+=("${defaultMx}")
 fi
 
 if [ "$OSTYPE" = "cygwin" ]; then
@@ -86,4 +86,4 @@ else
     jarpath="$libdir/$jarfile"
 fi
 
-exec java $javaOpts -cp "$jarpath" com.android.tools.r8.D8 "$@"
+exec java "${javaOpts[@]}" -cp "$jarpath" com.android.tools.r8.D8 "$@"
diff --git a/r8-compat-proguard b/r8-compat-proguard
index 47baf9d..4555f40 100755
--- a/r8-compat-proguard
+++ b/r8-compat-proguard
@@ -64,11 +64,11 @@ defaultMx="-Xmx2G"
 # example. "java" (with no args) and "java -X" give a summary of
 # available options.
 
-javaOpts=""
+declare -a javaOpts=()
 
 while expr "x$1" : 'x-J' >/dev/null; do
     opt=`expr "x$1" : 'x-J\(.*\)'`
-    javaOpts="${javaOpts} -${opt}"
+    javaOpts+=("-${opt}")
     if expr "x${opt}" : "xXmx[0-9]" >/dev/null; then
         defaultMx="no"
     fi
@@ -76,7 +76,7 @@ while expr "x$1" : 'x-J' >/dev/null; do
 done
 
 if [ "${defaultMx}" != "no" ]; then
-    javaOpts="${javaOpts} ${defaultMx}"
+    javaOpts+=("${defaultMx}")
 fi
 
 if [ "$OSTYPE" = "cygwin" ]; then
@@ -86,4 +86,4 @@ else
     jarpath="$libdir/$jarfile"
 fi
 
-exec java $javaOpts -jar "$jarpath" "$@"
+exec java "${javaOpts[@]}" -jar "$jarpath" "$@"