diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:52:01 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:52:01 -0700 |
| commit | a7b0bbcf671d016a6609abc004928f901d0d8dd6 (patch) | |
| tree | 866a2cb9523d8af9821af4e3fff805a440206fdd | |
| parent | b6d577870004cdb6b921118384d3b5a63c4a27d4 (diff) | |
| parent | 70eb3094205472f13aee7d16e41e7b7b7be8a2f8 (diff) | |
| download | devtools-a7b0bbcf671d016a6609abc004928f901d0d8dd6.tar.gz | |
Merge Android Pie into master
Bug: 112104996
Change-Id: Id9ef07a4f2cd5ce55120ada1b581a07a4480204e
| -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 "$@" |