Revert "Added more options for dependency resolution."

With the latest changes in dependency resolution in Studio itself,
it is no longer necessary to have the 3-state system property.

Reference: https://android-review.googlesource.com/67875

This reverts commit 7472d12db00e2f8325633efa96d2e0982382fda6.

Change-Id: Iec6315305c48f4089fd0b0364be75fd91d71c26e

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