Add the missing Android SDK toolchain type data to android_local_test.

Enable Android Platforms tests for android_local_test. Part of bazelbuild#16285.
katre · Oct 4, 2023 · ab99a7a · ab99a7a
1 parent 7458aa6
commit ab99a7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...ain/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestRule.java b/...ain/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestRule.java
@@ -23,6 +23,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.analysis.BaseRuleClasses;
+import com.google.devtools.build.lib.analysis.BaseRuleClasses.TestBaseRule;
 import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.analysis.config.ExecutionTransitionFactory;
@@ -94,13 +95,14 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment envi
 
   @Override
   public Metadata getMetadata() {
-    return RuleDefinition.Metadata.builder()
+    return Metadata.builder()
         .name("android_local_test")
         .type(RuleClassType.TEST)
         .ancestors(
             AndroidLocalTestBaseRule.class,
             BaseJavaBinaryRule.class,
-            BaseRuleClasses.TestBaseRule.class)
+            TestBaseRule.class,
+            BazelSdkToolchainRule.class)
         .factoryClass(BazelAndroidLocalTest.class)
         .build();
   }

diff --git a/...est/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestTest.java b/...est/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestTest.java
@@ -34,13 +34,13 @@ public static class WithoutPlatforms extends BazelAndroidLocalTestTest {}
   // TODO(b/161709111): With platforms, all tests fail with
   // "no attribute `$android_sdk_toolchain_type`" on AspectAwareAttributeMapper.
   /** Use platform-based toolchain resolution. */
-  /*  @RunWith(JUnit4.class)
-  public static class WithPlatforms extends GoogleAndroidLocalTestTest {
+  @RunWith(JUnit4.class)
+  public static class WithPlatforms extends BazelAndroidLocalTestTest {
     @Override
     protected boolean platformBasedToolchains() {
       return true;
     }
-  } */
+  }
 
   @Before
   @Override