Prepare Blaze tests to use the Java 11 language level

PiperOrigin-RevId: 343920254
katre · Nov 23, 2020 · bb1e635
1 parent 8b8c615
commit bb1e635
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkBase.java
@@ -28,6 +28,7 @@
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.packages.AggregatingAttributeMapper;
 import com.google.devtools.build.lib.packages.Type;
+import com.google.devtools.build.lib.rules.java.BootClassPathInfo;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration;
 
 /** Implementation of the {@code android_sdk} rule. */
@@ -71,6 +72,7 @@ public ConfiguredTarget create(RuleContext ruleContext)
     Artifact sourceProperties = ruleContext.getHostPrerequisiteArtifact("source_properties");
     Artifact shrinkedAndroidJar = ruleContext.getPrerequisiteArtifact("shrinked_android_jar");
     Artifact mainDexClasses = ruleContext.getPrerequisiteArtifact("main_dex_classes");
+    BootClassPathInfo system = ruleContext.getPrerequisite("system", BootClassPathInfo.PROVIDER);
 
     if (ruleContext.hasErrors()) {
       return null;
@@ -95,7 +97,7 @@ public ConfiguredTarget create(RuleContext ruleContext)
             apkSigner,
             proguard,
             zipalign,
-            /* system= */ null);
+            system);
 
     return new RuleConfiguredTargetBuilder(ruleContext)
         .addNativeDeclaredProvider(sdk)

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkBaseRule.java
@@ -24,6 +24,7 @@
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier;
+import com.google.devtools.build.lib.rules.java.BootClassPathInfo;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration;
 import com.google.devtools.build.lib.rules.java.JavaRuleClasses.JavaToolchainBaseRule;
 import com.google.devtools.build.lib.rules.java.JavaSemantics;
@@ -133,6 +134,10 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment envi
                 .cfg(ExecutionTransitionFactory.create())
                 .allowedFileTypes(ANY_FILE)
                 .exec())
+        .add(
+            attr("system", LABEL)
+                .allowedFileTypes()
+                .mandatoryProviders(BootClassPathInfo.PROVIDER.id()))
         .advertiseStarlarkProvider(
             StarlarkProviderIdentifier.forKey(AndroidSdkProvider.PROVIDER.getKey()))
         .build();

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
@@ -265,8 +265,6 @@ public Label getJavaToolchainLabel(JavaToolchainStarlarkApiProviderApi toolchain
 
   @Override
   public ProviderApi getBootClassPathInfo() {
-    // No implementation in Bazel. This method not callable in Starlark except through
-    // (discouraged) use of --experimental_google_legacy_api.
-    return null;
+    return BootClassPathInfo.PROVIDER;
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaCommonApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaCommonApi.java
@@ -602,7 +602,6 @@ JavaInfoT addCompileTimeJavaDependencyArtifacts(
   @StarlarkMethod(
       name = "BootClassPathInfo",
       doc = "The provider used to supply bootclasspath information",
-      structField = true,
-      enableOnlyWithFlag = BuildLanguageOptions.EXPERIMENTAL_GOOGLE_LEGACY_API)
+      structField = true)
   ProviderApi getBootClassPathInfo();
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
@@ -16,6 +16,7 @@
 import static com.google.common.base.Verify.verifyNotNull;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.common.truth.Truth8.assertThat;
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyArtifactNames;
 import static com.google.devtools.build.lib.rules.java.JavaCompileActionTestHelper.getClasspath;
 import static com.google.devtools.build.lib.rules.java.JavaCompileActionTestHelper.getCompileTimeDependencyArtifacts;
@@ -628,7 +629,9 @@ public void testExportsWithStrictJavaDepsFlag() throws Exception {
     JavaCompileAction javacAction =
         (JavaCompileAction) getGeneratingActionForLabel("//java/exports:libc.jar");
 
-    assertThat(prettyArtifactNames(getInputs(javacAction, getDirectJars(javacAction))))
+    assertThat(
+            prettyArtifactNames(getInputs(javacAction, getDirectJars(javacAction))).stream()
+                .filter(a -> !a.equals("tools/android/bootclasspath_android_only_auxiliary.jar")))
         .containsExactly("java/exports/libb-hjar.jar", "java/exports/liba-hjar.jar");
     assertNoEvents();
   }