From 64d9576a66c9e703f3d046e5bb3a939a6731d4c4 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Mon, 12 Mar 2018 13:50:28 -0700 Subject: Fixed uiautomatorviewer launcher for Unix so it runs with OpenJDK9. Test: uiautomatorviewer Bug: 74542448 Change-Id: I11358cfee7a99c0c410f350038acec305514e26f --- tools/uiautomatorviewer | 4 ++-- 1 file 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 "$@" -- cgit v1.2.3