Add support for external jar files in library project.

Bug: 2294012
Change-Id: I88bc99d9c3ac4135aac4c5af7995aca25bf5c4ee

diff --git a/anttasks/src/com/android/ant/SetupTask.java b/anttasks/src/com/android/ant/SetupTask.java
index 6f3d0a5..bf6a162 100644 (file)
--- a/anttasks/src/com/android/ant/SetupTask.java
+++ b/anttasks/src/com/android/ant/SetupTask.java
@@ -19,6 +19,7 @@ package com.android.ant;
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.ISdkLog;
+import com.android.sdklib.SdkConstants;
 import com.android.sdklib.SdkManager;
 import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
 import com.android.sdklib.internal.project.ProjectProperties;
@@ -36,6 +37,7 @@ import org.xml.sax.InputSource;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FilenameFilter;
 import java.util.ArrayList;
 import java.util.HashSet;
 
@@ -278,7 +280,7 @@ public final class SetupTask extends ImportTask {
      */
     private void checkManifest(Project antProject, AndroidVersion androidVersion) {
         try {
-            File manifest = new File(antProject.getBaseDir(), "AndroidManifest.xml");
+            File manifest = new File(antProject.getBaseDir(), SdkConstants.FN_ANDROID_MANIFEST_XML);
 
             XPath xPath = AndroidXPathFactory.newXPath();
 
@@ -356,8 +358,16 @@ public final class SetupTask extends ImportTask {
         // prepare several paths for future tasks
         Path sourcePath = new Path(antProject);
         Path resPath = new Path(antProject);
+        Path libsPath = new Path(antProject);
+        Path jarsPath = new Path(antProject);
         StringBuilder sb = new StringBuilder();
 
+        FilenameFilter filter = new FilenameFilter() {
+            public boolean accept(File dir, String name) {
+                return name.toLowerCase().endsWith(".jar");
+            }
+        };
+
         int index = 1;
         while (true) {
             String propName = ProjectProperties.PROPERTY_LIB_REF + Integer.toString(index++);
@@ -371,7 +381,7 @@ public final class SetupTask extends ImportTask {
             // "source.dir" in build.properties.
             PathElement element = sourcePath.createPathElement();
             ProjectProperties prop = ProjectProperties.load(rootPath, PropertyType.BUILD);
-            String sourceDir = "src";
+            String sourceDir = SdkConstants.FD_SOURCES;
             if (prop != null) {
                 String value = prop.getProperty(ProjectProperties.PROPERTY_BUILD_SOURCE_DIR);
                 if (value != null) {
@@ -383,10 +393,22 @@ public final class SetupTask extends ImportTask {
 
             // get the res path. Always $PROJECT/res
             element = resPath.createPathElement();
-            element.setPath(rootPath + "/res");
+            element.setPath(rootPath + "/" + SdkConstants.FD_RESOURCES);
+
+            // get the libs path. Always $PROJECT/libs
+            element = libsPath.createPathElement();
+            element.setPath(rootPath + "/" + SdkConstants.FD_NATIVE_LIBS);
+
+            // get the jars from it too
+            File libsFolder = new File(rootPath, SdkConstants.FD_NATIVE_LIBS);
+            File[] jarFiles = libsFolder.listFiles(filter);
+            for (File jarFile : jarFiles) {
+                element = jarsPath.createPathElement();
+                element.setPath(jarFile.getAbsolutePath());
+            }
 
             // get the package from the manifest.
-            File manifest = new File(rootPath, "AndroidManifest.xml");
+            File manifest = new File(rootPath, SdkConstants.FN_ANDROID_MANIFEST_XML);
             XPath xPath = AndroidXPathFactory.newXPath();
 
             // check the package name.
@@ -407,9 +429,11 @@ public final class SetupTask extends ImportTask {
 
         }
 
-        // even with no libraries, always setup android.libraries.src so that javac
-        // doesn't complain
+        // even with no libraries, always setup these so that various tasks in Ant don't complain
+        // (the task themselves can handle a ref to an empty Path)
         antProject.addReference("android.libraries.src", sourcePath);
+        antProject.addReference("android.libraries.jars", jarsPath);
+        antProject.addReference("android.libraries.libs", libsPath);
 
         // the rest is done only if there's a library.
         if (sourcePath.list().length > 0) {

diff --git a/files/android_rules.xml b/files/android_rules.xml
index 3d9cb19..9b180d8 100644 (file)
--- a/files/android_rules.xml
+++ b/files/android_rules.xml
@@ -126,6 +126,7 @@
              <arg line="${verbose.option}" />
              <arg path="${out.classes.absolute.dir}" />
              <fileset dir="${external.libs.absolute.dir}" includes="*.jar" />
+             <path refid="android.libraries.jars" />
              <external-libs />
          </apply>
        </sequential>
@@ -154,8 +155,10 @@
                 <file path="${intermediate.dex.file}" />
                 <sourcefolder path="${source.absolute.dir}" />
                 <sourcefolder refid="android.libraries.src" />
-                <nativefolder path="${native.libs.absolute.dir}" />
                 <jarfolder path="${external.libs.absolute.dir}" />
+                <jarfolder refid="android.libraries.libs" />
+                <nativefolder path="${native.libs.absolute.dir}" />
+                <nativefolder refid="android.libraries.libs" />
                 <extra-jars/>
             </apkbuilder>
         </sequential>
@@ -242,7 +245,8 @@
         <javac encoding="ascii" target="1.5" debug="true" extdirs=""
                 destdir="${out.classes.absolute.dir}"
                 bootclasspathref="android.target.classpath"
-                verbose="${verbose}" classpath="${extensible.classpath}">
+                verbose="${verbose}" classpath="${extensible.classpath}"
+                classpathref="android.libraries.jars">
             <src path="${source.absolute.dir}" />
             <src path="${gen.absolute.dir}" />
             <src refid="android.libraries.src" />