diff options
| author | Felipe Leme <felipeal@google.com> | 2018-04-16 18:48:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-16 18:48:34 -0700 |
| commit | f0bdfb021347f62ccc84a128ddce95663d4d78af (patch) | |
| tree | 866a2cb9523d8af9821af4e3fff805a440206fdd | |
| parent | f14f064012f6c77afab10e1f4b37d86a205ebc29 (diff) | |
| parent | 299cd9eabdb1b87b919cdc0c680f662f64340394 (diff) | |
| download | devtools-f0bdfb021347f62ccc84a128ddce95663d4d78af.tar.gz | |
Fixed uiautomatorviewer launcher for Unix so it runs with OpenJDK9. am: 64d9576a66
am: 299cd9eabd
Change-Id: I4d4a10a7dad935ed7cd3065e3dfcc9c1d4f89a02
| -rwxr-xr-x | tools/uiautomatorviewer | 4 |
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 "$@" |