commit 8996e71047a2bd11efee46ef14e02435ab5fa07a
author David Herman <davidherman@google.com> Tue Aug 04 16:45:13 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 04 16:45:13 2015 +0000
tree eb5e157dac1966c3eeb2c32a7640e5ce577a7e76
parent d103bd9ac106eb97a1ee7ac946b4584eec95a8e8
parent a688ec4f3b6c1470694405f60cf4cad63e7d179b

Merge "Android.bat: Quoted copy args" into studio-1.4-dev automerge: 9a8e16c
automerge: a688ec4

* commit 'a688ec4f3b6c1470694405f60cf4cad63e7d179b':
  Android.bat: Quoted copy args

sdkmanager/app/etc/android.bat

diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat
index 8690b77..b28eef0 100755
--- a/sdkmanager/app/etc/android.bat
+++ b/sdkmanager/app/etc/android.bat
@@ -48,20 +48,20 @@
 

     set tmp_dir=%TEMP%\temp-android-tool

     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

-    copy /B /D /Y lib\commons-logging*   %tmp_dir%\lib\        > nul

-    copy /B /D /Y lib\dvlib.jar          %tmp_dir%\lib\        > nul

-    copy /B /D /Y lib\gson*              %tmp_dir%\lib\        > nul

-    copy /B /D /Y lib\guava*             %tmp_dir%\lib\        > nul

-    copy /B /D /Y lib\httpclient*        %tmp_dir%\lib\        > nul

-    copy /B /D /Y lib\httpcore*          %tmp_dir%\lib\        > nul

-    copy /B /D /Y lib\httpmime*          %tmp_dir%\lib\        > nul

-    copy /B /D /Y lib\layoutlib-api.jar  %tmp_dir%\lib\        > nul

-    copy /B /D /Y lib\org-eclipse-*      %tmp_dir%\lib\        > nul

-    copy /B /D /Y lib\sdk*               %tmp_dir%\lib\        > nul

-    copy /B /D /Y lib\swtmenubar.jar     %tmp_dir%\lib\        > 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

+    copy /B /D /Y lib\commons-logging*   "%tmp_dir%\lib\"          > nul

+    copy /B /D /Y lib\dvlib.jar          "%tmp_dir%\lib\"          > nul

+    copy /B /D /Y lib\gson*              "%tmp_dir%\lib\"          > nul

+    copy /B /D /Y lib\guava*             "%tmp_dir%\lib\"          > nul

+    copy /B /D /Y lib\httpclient*        "%tmp_dir%\lib\"          > nul

+    copy /B /D /Y lib\httpcore*          "%tmp_dir%\lib\"          > nul

+    copy /B /D /Y lib\httpmime*          "%tmp_dir%\lib\"          > nul

+    copy /B /D /Y lib\layoutlib-api.jar  "%tmp_dir%\lib\"          > nul

+    copy /B /D /Y lib\org-eclipse-*      "%tmp_dir%\lib\"          > nul

+    copy /B /D /Y lib\sdk*               "%tmp_dir%\lib\"          > nul

+    copy /B /D /Y lib\swtmenubar.jar     "%tmp_dir%\lib\"          > nul

 

     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%