diff options
author | Xavier Ducrohet <xav@android.com> | 2013-05-13 17:28:09 -0700 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2013-05-13 17:45:55 -0700 |
commit | d2502b7b545ca00f86295068ecb5b30a0444166c (patch) | |
tree | 8f18990119bc619071ce6948cfa7806ada325233 /builder/src/main | |
parent | d2dfdc361e7ec0a90ebfb25cf822bc1f79b7c41f (diff) | |
download | build-d2502b7b545ca00f86295068ecb5b30a0444166c.tar.gz |
Use convention mapping for compile classpath.
Change-Id: I1eda8462157c0379d1d0a871fd497e7647ef8ead
Diffstat (limited to 'builder/src/main')
-rw-r--r-- | builder/src/main/java/com/android/builder/VariantConfiguration.java | 11 |
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); } } } |