From 9aa538ffaf7abdcf4fe56c51da75666e60c67a90 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Thu, 24 Feb 2011 19:41:49 -0800
Subject: Move the sdk io classes to common.jar

Change-Id: I59a7b770071707ed058aa104bab8a16aa8950d56
---
 anttasks/.classpath                         | 1 +
 anttasks/etc/manifest.txt                   | 2 +-
 anttasks/src/com/android/ant/SetupTask.java | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'anttasks')

diff --git a/anttasks/.classpath b/anttasks/.classpath
index 08ced21..9fc1c9c 100644
--- a/anttasks/.classpath
+++ b/anttasks/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/SdkLib"/>
 	<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/ant/ant.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/anttasks/etc/manifest.txt b/anttasks/etc/manifest.txt
index 0d89364..257f2aa 100644
--- a/anttasks/etc/manifest.txt
+++ b/anttasks/etc/manifest.txt
@@ -1 +1 @@
-Class-Path: sdklib.jar
+Class-Path: common.jar sdklib.jar
diff --git a/anttasks/src/com/android/ant/SetupTask.java b/anttasks/src/com/android/ant/SetupTask.java
index 6dc2c0f..e15f77b 100644
--- a/anttasks/src/com/android/ant/SetupTask.java
+++ b/anttasks/src/com/android/ant/SetupTask.java
@@ -16,6 +16,8 @@
 
 package com.android.ant;
 
+import com.android.io.FileWrapper;
+import com.android.io.FolderWrapper;
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.ISdkLog;
@@ -24,8 +26,6 @@ import com.android.sdklib.SdkManager;
 import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
 import com.android.sdklib.internal.project.ProjectProperties;
 import com.android.sdklib.internal.project.ProjectProperties.PropertyType;
-import com.android.sdklib.io.FileWrapper;
-import com.android.sdklib.io.FolderWrapper;
 import com.android.sdklib.xml.AndroidManifest;
 import com.android.sdklib.xml.AndroidXPathFactory;
 
-- 
cgit v1.1