summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2015-05-09 00:43:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-05-09 00:43:34 +0000
commit1e5e955e3612cea0f29cf935bd28b00e74d0f0aa (patch)
tree24913cdf6ee71d9e921284e5cd5d749d5ed6e089
parent11ef4e013b424e358f4d9e85bef7a88ad2ecf273 (diff)
parentdb246e2a0579b9169319d074d2104c4c156337af (diff)
downloadswt-1e5e955e3612cea0f29cf935bd28b00e74d0f0aa.tar.gz
Merge "android.bat: copy gson.jar to tmp folder while running" into studio-1.3-dev
automerge: db246e2 * commit 'db246e2a0579b9169319d074d2104c4c156337af': android.bat: copy gson.jar to tmp folder while running
-rwxr-xr-xsdkmanager/app/etc/android.bat1
1 files changed, 1 insertions, 0 deletions
diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat
index c0e435e..767e4d5 100755
--- a/sdkmanager/app/etc/android.bat
+++ b/sdkmanager/app/etc/android.bat
@@ -53,6 +53,7 @@ for /f "delims=" %%a in ('"%java_exe%" -jar lib\archquery.jar') do set swt_path=
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