diff options
author | Siva Velusamy <vsiva@google.com> | 2015-05-09 00:44:27 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-05-09 00:44:27 +0000 |
commit | f6cadc1e242cf5605699e7b25298b7b760e44d1f (patch) | |
tree | 24913cdf6ee71d9e921284e5cd5d749d5ed6e089 | |
parent | 0d309170acbcc6c3c0cc40b1e4b6ed5b20f8db64 (diff) | |
parent | 1e5e955e3612cea0f29cf935bd28b00e74d0f0aa (diff) | |
download | swt-f6cadc1e242cf5605699e7b25298b7b760e44d1f.tar.gz |
Merge "android.bat: copy gson.jar to tmp folder while running" into studio-1.3-dev automerge: db246e2
automerge: 1e5e955
* commit '1e5e955e3612cea0f29cf935bd28b00e74d0f0aa':
android.bat: copy gson.jar to tmp folder while running
-rwxr-xr-x | sdkmanager/app/etc/android.bat | 1 |
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
|