From c410f1cdfc20ba92faf5a571e28c1abd11c62ce4 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Mon, 1 Jun 2015 17:30:03 +0300
Subject: [PATCH] Android tests: use ant from dependencies dirs

---
 .../org/jetbrains/kotlin/android/tests/PathManager.java  | 2 +-
 .../kotlin/android/tests/download/SDKDownloader.java     | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java
index f63aefaede0..feb9b75d006 100644
--- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java
+++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java
@@ -75,7 +75,7 @@ public class PathManager {
     }
 
     public String getAntBinDirectory() {
-        return getDependenciesRoot() + "/apache-ant-1.8.0/bin";
+        return rootFolder + "/dependencies/ant-1.8/bin";
     }
 
     public String getAndroidModuleRoot() {
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java
index a8f94184669..08992cf5c82 100644
--- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java
+++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java
@@ -32,7 +32,6 @@ public class SDKDownloader {
     private final String systemImages;
     private final String platformToolsZipPath;
     private final String toolsZipPath;
-    private final String antZipPath;
 
     private final PathManager pathManager;
 
@@ -42,7 +41,6 @@ public class SDKDownloader {
         this.systemImages = pathManager.getRootForDownload() + "/system-images.zip";
         this.platformToolsZipPath = pathManager.getRootForDownload() + "/platform-tools.zip";
         this.toolsZipPath = pathManager.getRootForDownload() + "/tools.zip";
-        this.antZipPath = pathManager.getRootForDownload() + "/apache-ant-1.8.0.zip";
     }
 
     public void downloadPlatform() {
@@ -87,16 +85,11 @@ public class SDKDownloader {
         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() {
         downloadTools();
         downloadAbi();
         downloadPlatform();
         downloadPlatformTools();
-        downloadAnt();
     }
 
 
@@ -105,14 +98,12 @@ public class SDKDownloader {
         unzip(systemImages, pathManager.getAndroidSdkRoot() + "/system-images/android-16/");
         unzip(platformToolsZipPath, pathManager.getAndroidSdkRoot());
         unzip(toolsZipPath, pathManager.getAndroidSdkRoot());
-        unzip(antZipPath, pathManager.getDependenciesRoot());
     }
 
     public void deleteAll() {
         delete(platformZipPath);
         delete(platformToolsZipPath);
         delete(toolsZipPath);
-        delete(antZipPath);
     }
 
     private static void download(String urlString, String output) {