azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android tests: use ant from dependencies dirs

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-06-01 17:30:03 +03:00
parent 425f91dfc6
commit c410f1cdfc
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class PathManager {
} }
public String getAntBinDirectory() { public String getAntBinDirectory() {
return getDependenciesRoot() + "/apache-ant-1.8.0/bin"; return rootFolder + "/dependencies/ant-1.8/bin";
} }
public String getAndroidModuleRoot() { public String getAndroidModuleRoot() {
compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java
-9
View File
@@ -32,7 +32,6 @@ public class SDKDownloader {
private final String systemImages; private final String systemImages;
private final String platformToolsZipPath; private final String platformToolsZipPath;
private final String toolsZipPath; private final String toolsZipPath;
private final String antZipPath;
private final PathManager pathManager; private final PathManager pathManager;
@@ -42,7 +41,6 @@ public class SDKDownloader {
this.systemImages = pathManager.getRootForDownload() + "/system-images.zip"; this.systemImages = pathManager.getRootForDownload() + "/system-images.zip";
this.platformToolsZipPath = pathManager.getRootForDownload() + "/platform-tools.zip"; this.platformToolsZipPath = pathManager.getRootForDownload() + "/platform-tools.zip";
this.toolsZipPath = pathManager.getRootForDownload() + "/tools.zip"; this.toolsZipPath = pathManager.getRootForDownload() + "/tools.zip";
this.antZipPath = pathManager.getRootForDownload() + "/apache-ant-1.8.0.zip";
} }
public void downloadPlatform() { public void downloadPlatform() {
@@ -87,16 +85,11 @@ public class SDKDownloader {
download(downloadURL, toolsZipPath); download(downloadURL, toolsZipPath);
} }
public void downloadAnt() {
download("http://archive.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.zip", antZipPath);
}
public void downloadAll() { public void downloadAll() {
downloadTools(); downloadTools();
downloadAbi(); downloadAbi();
downloadPlatform(); downloadPlatform();
downloadPlatformTools(); downloadPlatformTools();
downloadAnt();
} }
@@ -105,14 +98,12 @@ public class SDKDownloader {
unzip(systemImages, pathManager.getAndroidSdkRoot() + "/system-images/android-16/"); unzip(systemImages, pathManager.getAndroidSdkRoot() + "/system-images/android-16/");
unzip(platformToolsZipPath, pathManager.getAndroidSdkRoot()); unzip(platformToolsZipPath, pathManager.getAndroidSdkRoot());
unzip(toolsZipPath, pathManager.getAndroidSdkRoot()); unzip(toolsZipPath, pathManager.getAndroidSdkRoot());
unzip(antZipPath, pathManager.getDependenciesRoot());
} }
public void deleteAll() { public void deleteAll() {
delete(platformZipPath); delete(platformZipPath);
delete(platformToolsZipPath); delete(platformToolsZipPath);
delete(toolsZipPath); delete(toolsZipPath);
delete(antZipPath);
} }
private static void download(String urlString, String output) { private static void download(String urlString, String output) {