Fixed uiautomatorviewer launcher for Unix so it runs with OpenJDK9.android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev

Test: uiautomatorviewer
Bug: 74542448

Change-Id: I11358cfee7a99c0c410f350038acec305514e26f

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/uiautomatorviewer b/tools/uiautomatorviewer
index 79faf5a..d9108cb 100755
--- a/tools/uiautomatorviewer
+++ b/tools/uiautomatorviewer
@@ -94,11 +94,11 @@ fi
 
 # Combine the swtpath and the framework dir path.
 if [ -d "$swtpath" ]; then
-    frameworkdir="${swtpath}:${frameworkdir}"
+    frameworkdir="${swtpath}/*:${frameworkdir}/*"
 else
     echo "SWT folder '${swtpath}' does not exist."
     echo "Please export ANDROID_SWT to point to the folder containing swt.jar for your platform."
     exit 1
 fi
 
-exec "${javaCmd}" $javaOpts -Djava.ext.dirs="$frameworkdir" -Dcom.android.uiautomator.bindir="$progdir" -jar "$jarpath" "$@"
+exec "${javaCmd}" $javaOpts -classpath "$frameworkdir:$jarpath" -Dcom.android.uiautomator.bindir="$progdir" com.android.uiautomator.UiAutomatorViewer "$@"