am 13799c1b: Merge "Update SDK prebuilts. Origin:"

* commit '13799c1b3a46930100980493f4f88553de1c9e3f':
  Update SDK prebuilts. Origin:

9 files changed, 71 insertions, 71 deletions

diff --git a/tools/android.bat b/tools/android.bat
index 2a34cd8..fd00218 100755
--- a/tools/android.bat
+++ b/tools/android.bat
@@ -25,7 +25,7 @@ rem and set up progdir to be the fully-qualified pathname of its directory.
 set prog=%~f0

 

 rem Grab current directory before we change it

-set work_dir="%cd%"

+set work_dir=%cd%

 

 rem Change current directory and drive to where the script is, to avoid

 rem issues with directories containing whitespaces.

@@ -40,7 +40,7 @@ if not defined java_exe goto :EOF
 set jar_path=lib\sdkmanager.jar;lib\swtmenubar.jar

 

 rem Set SWT.Jar path based on current architecture (x86 or x86_64)

-for /f %%a in ('%java_exe% -jar lib\archquery.jar') do set swt_path=lib\%%a

+for /f "delims=" %%a in ('"%java_exe%" -jar lib\archquery.jar') do set swt_path=lib\%%a

 

 :MkTempCopy

     rem Copy android.bat and its required libs to a temp dir.

@@ -71,7 +71,7 @@ for /f %%a in ('%java_exe% -jar lib\archquery.jar') do set swt_path=lib\%%a
 rem The global ANDROID_SWT always override the SWT.Jar path

 if defined ANDROID_SWT set swt_path=%ANDROID_SWT%

 

-if exist %swt_path% goto SetPath

+if exist "%swt_path%" goto SetPath

     echo ERROR: SWT folder '%swt_path%' does not exist.

     echo Please set ANDROID_SWT to point to the folder containing swt.jar for your platform.

     goto :EOF

@@ -79,6 +79,6 @@ if exist %swt_path% goto SetPath
 :SetPath

 rem Finally exec the java program and end here.

 REM set REMOTE_DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000

-call %java_exe% %REMOTE_DEBUG% -Dcom.android.sdkmanager.toolsdir="%tools_dir%" -Dcom.android.sdkmanager.workdir=%work_dir% -classpath "%jar_path%;%swt_path%\swt.jar" com.android.sdkmanager.Main %*

+call "%java_exe% %REMOTE_DEBUG%" "-Dcom.android.sdkmanager.toolsdir=%tools_dir%" "-Dcom.android.sdkmanager.workdir=%work_dir%" -classpath "%jar_path%;%swt_path%\swt.jar" com.android.sdkmanager.Main %*

 

 rem EOF

diff --git a/tools/ddms.bat b/tools/ddms.bat
index d710ea6..1f2e154 100755
--- a/tools/ddms.bat
+++ b/tools/ddms.bat
@@ -33,13 +33,13 @@ call lib\find_java.bat
 if not defined java_exe goto :EOF

 

 set jarfile=ddms.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

 

@@ -48,7 +48,7 @@ if debug NEQ "%1" goto NoDebug
     shift 1

 :NoDebug

 

-set jarpath=%frameworkdir%%jarfile%;%frameworkdir%swtmenubar.jar

+set jarpath=%frameworkdir%\%jarfile%;%frameworkdir%\swtmenubar.jar

 

 if not defined ANDROID_SWT goto QueryArch

     set swt_path=%ANDROID_SWT%

@@ -56,11 +56,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

@@ -70,5 +70,5 @@ set javaextdirs=%swt_path%;%frameworkdir%
 

 echo The standalone version of DDMS is deprecated.

 echo Please use Android Device Monitor (monitor.bat) instead.

-call %java_exe% %java_debug% -Dcom.android.ddms.bindir=%prog_dir% -classpath "%jarpath%;%swt_path%\swt.jar" com.android.ddms.Main %*

+call "%java_exe%" %java_debug% "-Dcom.android.ddms.bindir=%prog_dir%" -classpath "%jarpath%;%swt_path%\swt.jar" com.android.ddms.Main %*

 

diff --git a/tools/draw9patch.bat b/tools/draw9patch.bat
index b6826fc..6965a36 100755
--- a/tools/draw9patch.bat
+++ b/tools/draw9patch.bat
@@ -30,17 +30,17 @@ call lib\find_java.bat
 if not defined java_exe goto :EOF
 
 set jarfile=draw9patch.jar
-set frameworkdir=
+set frameworkdir=.
 set libdir=
 
-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%
 
-call %java_exe% -Djava.ext.dirs=%frameworkdir% -jar %jarpath% %*
+call "%java_exe%" "-Djava.ext.dirs=%frameworkdir%" -jar %jarpath% %*
diff --git a/tools/hierarchyviewer.bat b/tools/hierarchyviewer.bat
index 432294d..dbb5664 100755
--- a/tools/hierarchyviewer.bat
+++ b/tools/hierarchyviewer.bat
@@ -33,14 +33,14 @@ call lib\find_java.bat
 if not defined java_exe goto :EOF

 

 set jarfile=hierarchyviewer2.jar

-set frameworkdir=

+set frameworkdir=.

 set libdir=

 

-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

 

@@ -49,7 +49,7 @@ if debug NEQ "%1" goto NoDebug
     shift 1

 :NoDebug

 

-set jarpath=%frameworkdir%%jarfile%;%frameworkdir%hierarchyviewerlib.jar;%frameworkdir%swtmenubar.jar

+set jarpath=%frameworkdir%\%jarfile%;%frameworkdir%\hierarchyviewerlib.jar;%frameworkdir%\swtmenubar.jar

 

 if not defined ANDROID_SWT goto QueryArch

     set swt_path=%ANDROID_SWT%

@@ -57,11 +57,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

@@ -70,6 +70,6 @@ if exist %swt_path% goto SetPath
 

 echo The standalone version of hieararchyviewer is deprecated.

 echo Please use Android Device Monitor (tools/monitor.bat) instead.

-call %java_exe% %java_debug% -Xmx512m -Dcom.android.hierarchyviewer.bindir=%prog_dir% -classpath "%jarpath%;%swt_path%\swt.jar" com.android.hierarchyviewer.HierarchyViewerApplication %*

+call "%java_exe%" %java_debug% -Xmx512m "-Dcom.android.hierarchyviewer.bindir=%prog_dir%" -classpath "%jarpath%;%swt_path%\swt.jar" com.android.hierarchyviewer.HierarchyViewerApplication %*

 

 

diff --git a/tools/jobb.bat b/tools/jobb.bat
index a5043c1..0547153 100755
--- a/tools/jobb.bat
+++ b/tools/jobb.bat
@@ -33,19 +33,19 @@ call lib\find_java.bat
 if not defined java_exe goto :EOF

 

 set jarfile=jobb.jar

-set frameworkdir=

+set frameworkdir=.

 set libdir=

 

-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%;%frameworkdir%libfat32.jar

+set jarpath=%frameworkdir%\%jarfile%;%frameworkdir%\libfat32.jar

 

-call %java_exe% %java_debug% -classpath "%jarpath%" com.android.jobb.Main %*

+call "%java_exe%" %java_debug% -classpath "%jarpath%" com.android.jobb.Main %*

 

 

diff --git a/tools/lint.bat b/tools/lint.bat
index 2428d87..ff0bb52 100755
--- a/tools/lint.bat
+++ b/tools/lint.bat
@@ -21,7 +21,7 @@ rem and set up progdir to be the fully-qualified pathname of its directory.
 set prog=%~f0
 
 rem Grab current directory before we change it
-set work_dir="%cd%"
+set work_dir=%cd%
 
 rem Change current directory and drive to where the script is, to avoid
 rem issues with directories containing whitespaces.
@@ -36,13 +36,13 @@ call lib\find_java.bat
 if not defined java_exe goto :EOF
 
 set jarfile=lint.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
 
@@ -51,8 +51,8 @@ if debug NEQ "%1" goto NoDebug
     shift 1
 :NoDebug
 
-set jarpath=%frameworkdir%%jarfile%
+set jarpath=%frameworkdir%\%jarfile%
 set javaextdirs=%frameworkdir%
 
-call %java_exe% %java_debug% -Xmx512m -Dcom.android.tools.lint.bindir=%prog_dir% -Dcom.android.tools.lint.workdir=%work_dir% -Djava.awt.headless=true -classpath "%jarpath%" com.android.tools.lint.Main %*
+call "%java_exe%" %java_debug% -Xmx512m "-Dcom.android.tools.lint.bindir=%prog_dir%" "-Dcom.android.tools.lint.workdir=%work_dir%" -Djava.awt.headless=true -classpath "%jarpath%" com.android.tools.lint.Main %*
 
diff --git a/tools/monkeyrunner.bat b/tools/monkeyrunner.bat
index 5028b3f..531d5dd 100644
--- a/tools/monkeyrunner.bat
+++ b/tools/monkeyrunner.bat
@@ -30,18 +30,18 @@ call lib\find_java.bat
 if not defined java_exe goto :EOF
 
 set jarfile=monkeyrunner.jar
-set frameworkdir=
+set frameworkdir=.
 set libdir=
 
-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%
@@ -49,15 +49,15 @@ 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
 
 :SetPath
 
-call %java_exe% -Xmx512m -Djava.ext.dirs=%frameworkdir%;%swt_path% -Dcom.android.monkeyrunner.bindir=..\framework -jar %jarpath% %*
+call "%java_exe%" -Xmx512m "-Djava.ext.dirs=%frameworkdir%;%swt_path%" -Dcom.android.monkeyrunner.bindir=..\framework -jar %jarpath% %*
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% %*
diff --git a/tools/uiautomatorviewer.bat b/tools/uiautomatorviewer.bat
index f3f5d47..d3bdbd8 100755
--- a/tools/uiautomatorviewer.bat
+++ b/tools/uiautomatorviewer.bat
@@ -33,17 +33,17 @@ call lib\find_java.bat
 if not defined java_exe goto :EOF
 
 set jarfile=uiautomatorviewer.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%
@@ -51,11 +51,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
@@ -63,4 +63,4 @@ if exist %swt_path% goto SetPath
 :SetPath
 set javaextdirs=%swt_path%;%frameworkdir%
 
-call %java_exe% -Djava.ext.dirs=%javaextdirs% -Dcom.android.uiautomator.bindir=%prog_dir% -jar %jarpath% %*
+call "%java_exe%" "-Djava.ext.dirs=%javaextdirs%" "-Dcom.android.uiautomator.bindir=%prog_dir%" -jar %jarpath% %*