commit c2d088f547bfeda2c5978883dae02aef18685cb1
author hlopko <hlopko@google.com> Mon Jul 01 08:23:20 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jul 01 08:24:09 2019 -0700
tree 6eff57b9206275654ac7baeb6d6328d15f65e2f8
parent 8167f46ce53201ca3d725b6262c6b9e31dac2f13

Remove incorrect cache in AndroidLocalTest.java

Fixes https://github.com/bazelbuild/bazel/issues/8693

RELNOTES: None.
PiperOrigin-RevId: 255958717

src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTest.java

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTest.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTest.java
index e55439a..3a9b6b3 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTest.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTest.java
@@ -38,8 +38,6 @@
     super(BazelAndroidSemantics.INSTANCE);
   }
 
-  Artifact androidAllJarsPropFile;
-
   @Override
   protected AndroidSemantics createAndroidSemantics() {
     return BazelAndroidSemantics.INSTANCE;
@@ -95,14 +93,6 @@
   // throw an error.
   protected Artifact getAndroidAllJarsPropertiesFile(RuleContext ruleContext)
       throws RuleErrorException {
-    if (androidAllJarsPropFile == null) {
-      androidAllJarsPropFile = getAndroidAllJarsPropertiesFileHelper(ruleContext);
-    }
-    return androidAllJarsPropFile;
-  }
-
-  private Artifact getAndroidAllJarsPropertiesFileHelper(RuleContext ruleContext)
-      throws RuleErrorException {
     Iterable<RunfilesProvider> runfilesProviders =
         ruleContext.getPrerequisites("deps", Mode.TARGET, RunfilesProvider.class);
     for (RunfilesProvider runfilesProvider : runfilesProviders) {

src/test/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestTest.java
index d2c42db..fc7389b 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestTest.java
@@ -72,4 +72,23 @@
   @Override
   public void checkMainClass(ConfiguredTarget target, String targetName, boolean coverageEnabled)
       throws Exception {}
+
+  @Override
+  public void testDeployJar() throws Exception {
+    // TODO(jingwen): Implement actual test.
+  }
+
+  @Override
+  public void testInferredJavaPackageFromPackageName() throws Exception {
+    // TODO(jingwen): Implement actual test.
+  }
+
+  @Override
+  public void testFeatureFlagPolicyIsNotUsedIfFlagValuesNotUsed() throws Exception {
+    // TODO(jingwen): Implement actual test.
+  }
+
+  @Override
+  public void androidManifestMergerOrderAlphabeticalByConfiguration_MergeesSortedByPathInBinOrGen()
+      throws Exception {}
 }