Use convention mapping for compile classpath.

Change-Id: I1eda8462157c0379d1d0a871fd497e7647ef8ead

1 files changed, 5 insertions, 6 deletions

diff --git a/builder/src/main/java/com/android/builder/VariantConfiguration.java b/builder/src/main/java/com/android/builder/VariantConfiguration.java
index f569e90..3ed10ce 100644
--- a/builder/src/main/java/com/android/builder/VariantConfiguration.java
+++ b/builder/src/main/java/com/android/builder/VariantConfiguration.java
@@ -749,8 +749,8 @@ public class VariantConfiguration implements TestData {
 
         for (LibraryDependency lib : mFlatLibraries) {
             classpath.add(lib.getJarFile());
-            for (JarDependency jarDependency : lib.getLocalDependencies()) {
-                classpath.add(jarDependency.getJarFile());
+            for (File jarFile : lib.getLocalJars()) {
+                classpath.add(jarFile);
             }
         }
 
@@ -785,10 +785,9 @@ public class VariantConfiguration implements TestData {
             if (libJar.exists()) {
                 jars.add(libJar);
             }
-            for (JarDependency jarDependency : libraryDependency.getLocalDependencies()) {
-                File jar = jarDependency.getJarFile();
-                if (jar.isFile()) {
-                    jars.add(jar);
+            for (File jarFile : libraryDependency.getLocalJars()) {
+                if (jarFile.isFile()) {
+                    jars.add(jarFile);
                 }
             }
         }