Reverts adding manifest and/or rules as deps on tests rules; This wor…

…ks, so it's better to leave this way as it's more intuitive to only depend on the actual library rule and not the hidden ones when writing BUCK files manually (#854)
uber · Jun 6, 2019 · b69b2df · b69b2df
1 parent a2b5022
commit b69b2df
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/buildSrc/src/main/java/com/uber/okbuck/composer/android/AndroidTestRuleComposer.java b/buildSrc/src/main/java/com/uber/okbuck/composer/android/AndroidTestRuleComposer.java
@@ -31,8 +31,6 @@ public static Rule compose(
 
     List<String> testDeps = new ArrayList<>(deps);
     testDeps.add(":" + src(target));
-    testDeps.add(manifestRule);
-    testDeps.add(":" + res(target));
     testDeps.addAll(external(target.getExternalDeps(true)));
     testDeps.addAll(targets(target.getTargetDeps(true)));
 

diff --git a/buildSrc/src/main/java/com/uber/okbuck/generator/BuckFileGenerator.java b/buildSrc/src/main/java/com/uber/okbuck/generator/BuckFileGenerator.java
@@ -171,7 +171,6 @@ private static List<Rule> createRules(
         AndroidModuleRuleComposer.compose(
             target, deps, aidlRuleNames, appClass, extraResDeps));
 
-    // Adding resource and manig
     // Test
     if (target.getRobolectricEnabled()
         && !target.getTest().getSources().isEmpty()
@@ -255,12 +254,9 @@ private static List<Rule> createRules(
     Rule testAppManifest = ManifestRuleComposer.composeForBinary(target);
     rules.add(testAppManifest);
 
-    List<String> srcAndResDeps = filterAndroidDepRules(rules);
-    srcAndResDeps.addAll(filterAndroidResDepRules(rules));
-
     rules.add(
         AndroidInstrumentationApkRuleComposer.compose(
-            srcAndResDeps, mainApkTarget, testAppManifest.buckName()));
+            filterAndroidDepRules(rules), mainApkTarget, testAppManifest.buckName()));
     rules.add(AndroidInstrumentationTestRuleComposer.compose(mainApkTarget));
     return rules;
   }