Add local jars to the dependencies.

Change-Id: Id0cf604cb17d95043d4e0286f81c2c97e86ae44f

2 files changed, 29 insertions, 17 deletions

diff --git a/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy b/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy
index 72c59e5..69b4de7 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy
@@ -31,7 +31,7 @@ import org.gradle.api.internal.project.ProjectInternal
 class BaseExtension {
 
     String target
-    final ProductFlavorDsl defaultConfig = new ProductFlavorDsl("main");
+    final ProductFlavorDsl defaultConfig = new ProductFlavorDsl("main")
 
     final AaptOptionsImpl aaptOptions = new AaptOptionsImpl()
     final DexOptionsImpl dexOptions = new DexOptionsImpl()
@@ -46,38 +46,38 @@ class BaseExtension {
                 new AndroidSourceSetFactory(project.fileResolver))
 
         sourceSetsContainer.whenObjectAdded { AndroidSourceSet sourceSet ->
-            ConfigurationContainer configurations = project.getConfigurations();
+            ConfigurationContainer configurations = project.getConfigurations()
 
             Configuration compileConfiguration = configurations.findByName(
-                    sourceSet.getCompileConfigurationName());
+                    sourceSet.getCompileConfigurationName())
             if (compileConfiguration == null) {
-                compileConfiguration = configurations.add(sourceSet.getCompileConfigurationName());
+                compileConfiguration = configurations.add(sourceSet.getCompileConfigurationName())
             }
             compileConfiguration.setVisible(false);
             compileConfiguration.setDescription(
-                    String.format("Classpath for compiling the %s sources.", sourceSet.getName()));
+                    String.format("Classpath for compiling the %s sources.", sourceSet.getName()))
 
             Configuration packageConfiguration = configurations.findByName(
-                    sourceSet.getPackageConfigurationName());
+                    sourceSet.getPackageConfigurationName())
             if (packageConfiguration == null) {
-                packageConfiguration = configurations.add(sourceSet.getPackageConfigurationName());
+                packageConfiguration = configurations.add(sourceSet.getPackageConfigurationName())
             }
-            packageConfiguration.setVisible(false);
-            packageConfiguration.extendsFrom(compileConfiguration);
+            packageConfiguration.setVisible(false)
+            packageConfiguration.extendsFrom(compileConfiguration)
             packageConfiguration.setDescription(
                     String.format("Classpath packaged with the compiled %s classes.",
                             sourceSet.getName()));
 
-            sourceSet.getJava().srcDir(String.format("src/%s/java", sourceSet.getName()));
+            sourceSet.getJava().srcDir(String.format("src/%s/java", sourceSet.getName()))
             sourceSet.getResources().srcDir(
-                    String.format("src/%s/resources", sourceSet.getName()));
-            sourceSet.getRes().srcDir(String.format("src/%s/res", sourceSet.getName()));
-            sourceSet.getAssets().srcDir(String.format("src/%s/assets", sourceSet.getName()));
+                    String.format("src/%s/resources", sourceSet.getName()))
+            sourceSet.getRes().srcDir(String.format("src/%s/res", sourceSet.getName()))
+            sourceSet.getAssets().srcDir(String.format("src/%s/assets", sourceSet.getName()))
             sourceSet.getManifest().srcFile(
-                    String.format("src/%s/AndroidManifest.xml", sourceSet.getName()));
-            sourceSet.getAidl().srcDir(String.format("src/%s/aidl", sourceSet.getName()));
-            sourceSet.getRenderscript().srcDir(String.format("src/%s/rs", sourceSet.getName()));
-            sourceSet.getJni().srcDir(String.format("src/%s/jni", sourceSet.getName()));
+                    String.format("src/%s/AndroidManifest.xml", sourceSet.getName()))
+            sourceSet.getAidl().srcDir(String.format("src/%s/aidl", sourceSet.getName()))
+            sourceSet.getRenderscript().srcDir(String.format("src/%s/rs", sourceSet.getName()))
+            sourceSet.getJni().srcDir(String.format("src/%s/jni", sourceSet.getName()))
         }
     }
 
diff --git a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
index c68ec3e..065ffe7 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
@@ -42,6 +42,7 @@ import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ModuleVersionIdentifier
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.ResolvedArtifact
+import org.gradle.api.artifacts.SelfResolvingDependency
 import org.gradle.api.artifacts.result.ResolvedDependencyResult
 import org.gradle.api.artifacts.result.ResolvedModuleVersionResult
 import org.gradle.api.internal.plugins.ProcessResources
@@ -641,6 +642,17 @@ abstract class BasePlugin {
             addDependency(dep.selected, checker, configDependencies, bundles, jars, modules,
                     artifacts, reverseMap)
         }
+        // also need to process local jar files, as they are not processed by the
+        // resolvedConfiguration result
+        compileClasspath.allDependencies.each { dep ->
+            if (dep instanceof SelfResolvingDependency &&
+                    (dep instanceof ProjectDependency) == false) {
+                Set<File> files = ((SelfResolvingDependency) dep).resolve()
+                for (File f : files) {
+                    jars << new JarDependency(f.absolutePath, true, true, true)
+                }
+            }
+        }
 
         configDependencies.libraries = bundles
         configDependencies.jars = jars