aboutsummaryrefslogtreecommitdiff
path: root/gradle
diff options
context:
space:
mode:
authorAlex Ruiz <alruiz@google.com>2013-09-25 16:35:45 -0700
committerAlex Ruiz <alruiz@google.com>2013-09-25 16:37:57 -0700
commit86d68ddd928ec9b53a0cc815b9122b5c52d56158 (patch)
treee286d749183e35b7d306a9bad3aa255d6bd71d00 /gradle
parent45fc6c575817ceaa2f2bda86dae69179a44d8e05 (diff)
downloadbuild-86d68ddd928ec9b53a0cc815b9122b5c52d56158.tar.gz
Importing project with missing deps now works in Gradle 1.8.
Change-Id: I08483c6371f79c2bddbd7e40b2f3faada5734d84
Diffstat (limited to 'gradle')
-rw-r--r--gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy4
1 files changed, 2 insertions, 2 deletions
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 cd13e54..cf1bff1 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
@@ -1467,7 +1467,7 @@ public abstract class BasePlugin {
// files.
Configuration packageClasspath = variantDeps.packageConfiguration
- if (currentUnresolvedDependencies.isEmpty()) {
+ if (!compileClasspath.resolvedConfiguration.hasError()) {
Set<File> compileFiles = compileClasspath.files
Set<File> packageFiles = packageClasspath.files
@@ -1484,7 +1484,7 @@ public abstract class BasePlugin {
"' is not supported")
}
}
- } else {
+ } else if (!currentUnresolvedDependencies.isEmpty()) {
unresolvedDependencies.addAll(currentUnresolvedDependencies)
}