Wire up allowlist to disable DexArchiveAspect when actions are in Starlark. This avoids duplicate aspects. PiperOrigin-RevId: 574580152 Change-Id: Id7ce2f78704090759411d65289b42b2c33af38d0
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java index 38d0ed8..aa55739 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
@@ -176,6 +176,12 @@ AndroidRuleClasses.getAndroidSdkLabel( Label.parseCanonicalUnchecked( toolsRepository + AndroidRuleClasses.DEFAULT_SDK)))) + .add( + Allowlist.getAttributeFromAllowlistName("enable_starlark_dex_desugar_proguard") + .value( + Label.parseCanonicalUnchecked( + toolsRepository + + "//tools/allowlists/android_binary_allowlist:enable_starlark_dex_desugar_proguard"))) .requiresConfigurationFragments(AndroidConfiguration.class) .requireAspectsWithProviders( ImmutableList.of(ImmutableSet.of(forKey(JavaInfo.PROVIDER.getKey()))));
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 66db368..61bac48 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -422,6 +422,16 @@ "package_group(name='config_feature_flag_Setter', packages=['public'])"); config.create( + "embedded_tools/tools/allowlists/android_binary_allowlist/BUILD", + "package_group(", + " name='enable_starlark_dex_desugar_proguard',", + " includes=['@@//tools/allowlists/android_binary_allowlist:enable_starlark_dex_desugar_proguard'],", + ")"); + config.create( + "tools/allowlists/android_binary_allowlist/BUILD", + "package_group(name='enable_starlark_dex_desugar_proguard', packages=[])"); + + config.create( "embedded_tools/tools/proto/BUILD", "package(default_visibility=['//visibility:public'])", "alias(name='protoc',actual='@com_google_protobuf//:protoc')",