Update SDK prebuilts.

Origin:

tools/base: @ 4262954a840e8ded11067279bcc50b5a9de1a65e
tools/swt: @ 673aefc4f92238836c4381d92dac2f73f31c120a

Change-Id: Iba6ba97a2eb1f9d0cd0309bd0469d3b68bcfe05c

1 files changed, 9 insertions, 9 deletions

diff --git a/tools/traceview.bat b/tools/traceview.bat
index 63416dd..8b71731 100755
--- a/tools/traceview.bat
+++ b/tools/traceview.bat
@@ -30,17 +30,17 @@ call lib\find_java.bat
 if not defined java_exe goto :EOF
 
 set jarfile=traceview.jar
-set frameworkdir=
+set frameworkdir=.
 
-if exist %frameworkdir%%jarfile% goto JarFileOk
-    set frameworkdir=lib\
+if exist %frameworkdir%\%jarfile% goto JarFileOk
+    set frameworkdir=lib
 
-if exist %frameworkdir%%jarfile% goto JarFileOk
-    set frameworkdir=..\framework\
+if exist %frameworkdir%\%jarfile% goto JarFileOk
+    set frameworkdir=..\framework
 
 :JarFileOk
 
-set jarpath=%frameworkdir%%jarfile%
+set jarpath=%frameworkdir%\%jarfile%
 
 if not defined ANDROID_SWT goto QueryArch
     set swt_path=%ANDROID_SWT%
@@ -48,11 +48,11 @@ if not defined ANDROID_SWT goto QueryArch
 
 :QueryArch
 
-    for /f %%a in ('%java_exe% -jar %frameworkdir%archquery.jar') do set swt_path=%frameworkdir%%%a
+    for /f "delims=" %%a in ('"%java_exe%" -jar %frameworkdir%\archquery.jar') do set swt_path=%frameworkdir%\%%a
 
 :SwtDone
 
-if exist %swt_path% goto SetPath
+if exist "%swt_path%" goto SetPath
     echo SWT folder '%swt_path%' does not exist.
     echo Please set ANDROID_SWT to point to the folder containing swt.jar for your platform.
     exit /B
@@ -62,4 +62,4 @@ set javaextdirs=%swt_path%;%frameworkdir%
 
 echo The standalone version of traceview is deprecated.
 echo Please use Android Device Monitor (tools/monitor) instead.
-call %java_exe% -Djava.ext.dirs=%javaextdirs% -Dcom.android.traceview.toolsdir= -jar %jarpath% %*
+call "%java_exe%" "-Djava.ext.dirs=%javaextdirs%" -Dcom.android.traceview.toolsdir= -jar %jarpath% %*