diff options
| author | Alex Ruiz <alruiz@google.com> | 2013-10-11 23:40:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-11 23:40:07 +0000 |
| commit | 1bdc60387e2dcdefe626f9229a0c46d5625b514e (patch) | |
| tree | 9a13aacf4abb9ce60c1e21060f23090eb124cb77 | |
| parent | 47a1d14f4cec8405a808e85218267f57b2aeb982 (diff) | |
| parent | ebd1088a73968a457394b00d6891355439086c76 (diff) | |
| download | build-1bdc60387e2dcdefe626f9229a0c46d5625b514e.tar.gz | |
Merge "Revert "Added more options for dependency resolution.""
| -rw-r--r-- | gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy | 21 |
1 files changed, 4 insertions, 17 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 dc66176..000b418 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy @@ -1514,26 +1514,13 @@ public abstract class BasePlugin { static def collectArtifacts(Configuration configuration, Map<ModuleVersionIdentifier, List<ResolvedArtifact>> artifacts) { - // This property indicates how dependencies should be resolved: - // 1. null: Resolve dependencies and fail if some dependency cannot be resolved - // 2. true: Do not resolve dependencies - // 3. false: Resolve dependencies and do not fail if some dependency cannot be resolved - // Option #1 is used when building a project either on the command line or from Android Studio. - // Option #2 and #3 are used for importing a project into Android Studio. - def buildModelOnlyProperty = System.getProperty(AndroidProject.BUILD_MODEL_ONLY_SYSTEM_PROPERTY) + boolean buildModelOnly = Boolean.getBoolean(AndroidProject.BUILD_MODEL_ONLY_SYSTEM_PROPERTY); def allArtifacts - if (buildModelOnlyProperty == null) { + if (buildModelOnly) { + allArtifacts = configuration.resolvedConfiguration.lenientConfiguration.getArtifacts(Specs.satisfyAll()) + } else { allArtifacts = configuration.resolvedConfiguration.resolvedArtifacts } - else { - boolean buildModelOnly = Boolean.parseBoolean(buildModelOnlyProperty) - if (buildModelOnly) { - allArtifacts = Collections.emptySet() - } - else { - allArtifacts = configuration.resolvedConfiguration.lenientConfiguration.getArtifacts(Specs.satisfyAll()) - } - } allArtifacts.each { ResolvedArtifact artifact -> def id = artifact.moduleVersion.id |