Revert changes around classpath deps in AndroidBinary

Reviewed By: bobyangyf

shipit-source-id: d140c6a9ce

Author: Sergey Tyurin

src/com/facebook/buck/android/AndroidBinary.java

@@ -55,7 +55,6 @@
 import com.facebook.buck.util.RichStream;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
@@ -65,7 +64,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.SortedSet;
-import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 /**
@@ -118,8 +116,6 @@ public class AndroidBinary extends AbstractBuildRule
 
   private final BuildRuleParams buildRuleParams;
 
-  private final Supplier<ImmutableSet<BuildRule>> classpathDepsSupplier;
-
   @AddToRuleKey private final AndroidBinaryBuildable buildable;
 
   // TODO(cjhopman): What's the difference between shouldProguard and skipProguard?
@@ -233,17 +229,11 @@ public class AndroidBinary extends AbstractBuildRule
             true);
     this.exopackageInfo = exopackageInfo;
 
-    this.classpathDepsSupplier =
-        Suppliers.memoize(
-            () -> ruleFinder.filterBuildRuleInputs(enhancementResult.getClasspathEntriesToDex()));
-
     params =
-        new BuildRuleParams(
-            ImmutableSortedSet::of,
+        params.withExtraDeps(
             () ->
                 BuildableSupport.deriveDeps(this, ruleFinder)
-                    .collect(ImmutableSortedSet.toImmutableSortedSet(Ordering.natural())),
-            params.getTargetGraphOnlyDeps());
+                    .collect(ImmutableSortedSet.toImmutableSortedSet(Ordering.natural())));
     this.buildRuleParams = params;
   }
 
@@ -365,8 +355,8 @@ public Keystore getKeystore() {
     return keystore;
   }
 
-  public ImmutableSet<BuildRule> getClasspathDeps() {
-    return classpathDepsSupplier.get();
+  public SortedSet<BuildRule> getClasspathDeps() {
+    return getDeclaredDeps();
   }
 
   @Override

test/com/facebook/buck/android/AndroidResourceLibraryDepIntegrationTest.java

@@ -69,7 +69,7 @@ public void testModifyingLibraryDependencyDoesNotCauseRebuilt() throws IOExcepti
     // Now verify that just the library and top-level binary got rebuilt.
     BuckBuildLog secondBuildLog = workspace.getBuildLog();
     secondBuildLog.assertTargetBuiltLocally(appTarget);
-    secondBuildLog.assertTargetIsAbsent(resTarget);
+    secondBuildLog.assertTargetHadMatchingRuleKey(resTarget);
     secondBuildLog.assertTargetBuiltLocally(libTarget);
   }
 }