diff options
| author | David Herman <davidherman@google.com> | 2015-08-04 16:26:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-08-04 16:26:18 +0000 |
| commit | 43e189a47b675a0898163746a3649895f17ac70b (patch) | |
| tree | 85690ac8afbd33f26ea234825b29f7e87631c7b8 | |
| parent | 9b5e3253ff1732f76e4f1a53b4c591b2d0a6af69 (diff) | |
| parent | 98c998386e34d956b4ab6ab92b313039cb522f93 (diff) | |
| download | swt-43e189a47b675a0898163746a3649895f17ac70b.tar.gz | |
Merge "Quote xcopy arguments to fix "Invalid number of parameters" error" into studio-1.4-dev
automerge: 98c9983
* commit '98c998386e34d956b4ab6ab92b313039cb522f93':
Quote xcopy arguments to fix "Invalid number of parameters" error
| -rwxr-xr-x | sdkmanager/app/etc/android.bat | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat index 767e4d5..8690b77 100755 --- a/sdkmanager/app/etc/android.bat +++ b/sdkmanager/app/etc/android.bat @@ -47,7 +47,7 @@ for /f "delims=" %%a in ('"%java_exe%" -jar lib\archquery.jar') do set swt_path= rem This avoids locking the tool dir in case the user is trying to update it.
set tmp_dir=%TEMP%\temp-android-tool
- xcopy %swt_path% %tmp_dir%\%swt_path% /I /E /C /G /R /Y /Q > nul
+ xcopy "%swt_path%" "%tmp_dir%\%swt_path%" /I /E /C /G /R /Y /Q > nul
copy /B /D /Y lib\common.jar %tmp_dir%\lib\ > nul
copy /B /D /Y lib\commons-codec* %tmp_dir%\lib\ > nul
copy /B /D /Y lib\commons-compress* %tmp_dir%\lib\ > nul
@@ -65,7 +65,7 @@ for /f "delims=" %%a in ('"%java_exe%" -jar lib\archquery.jar') do set swt_path= rem jar_path and swt_path are relative to PWD so we don't need to adjust them, just change dirs.
set tools_dir=%cd%
- cd /d %tmp_dir%
+ cd /d "%tmp_dir%"
:EndTempCopy
|