Add java_import_empty_jars allowlist to native implementation of Java…

…Import PiperOrigin-RevId: 480538536 Change-Id: Iee05e42333f3ead0c8e6d7acc2fb5ed9975ecbd1
bazelbuild · Oct 12, 2022 · 67d3bca · 67d3bca
1 parent 7866fd9
commit 67d3bca
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
@@ -214,8 +214,11 @@ private static boolean exportError(RuleContext ruleContext) {
 
  private static void checkJarsAttributeEmpty(RuleContext ruleContext) {
  if (ruleContext.getPrerequisites("jars").isEmpty()
- && ruleContext.getFragment(JavaConfiguration.class).disallowJavaImportEmptyJars()) {
- ruleContext.ruleError("empty java_import.jars is no longer supported");
+ && ruleContext.getFragment(JavaConfiguration.class).disallowJavaImportEmptyJars()
+ && Allowlist.hasAllowlist(ruleContext, "java_import_empty_jars")
+ && !Allowlist.isAvailable(ruleContext, "java_import_empty_jars")) {
+ ruleContext.ruleError(
+ "empty java_import.jars is no longer supported " + ruleContext.getLabel());
  }
  }