Skip desugaring actions within AndroidBinary if the Starlark Dex and …

…Desugaring pipeline has been enabled. PiperOrigin-RevId: 605942410 Change-Id: I4d8602bf0284b539c0508a4a067a1386e2971e49
bazelbuild · Feb 11, 2024 · eae0528 · eae0528
1 parent a54a393
commit eae0528
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -2233,6 +2233,10 @@ public static Function<Artifact, Artifact> collectDesugaredJars(
     if (!AndroidCommon.getAndroidConfig(ruleContext).desugarJava8()) {
       return Functions.identity();
     }
+    if (Allowlist.hasAllowlist(ruleContext, "enable_starlark_dex_desugar_proguard")
+        && Allowlist.isAvailable(ruleContext, "enable_starlark_dex_desugar_proguard")) {
+      return Functions.identity();
+    }
     AndroidRuntimeJarProvider.Builder result =
         collectDesugaredJarsFromAttributes(
             ruleContext, semantics.getAttributesWithJavaRuntimeDeps(ruleContext));