From ed5276f0827915166e89b72bf26f7e65f68d2dd5 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Wed, 1 May 2024 20:02:36 +0000 Subject: Revert "Make the enabled property configurable" Revert submission 27162921-configurable_enabled_property Reason for revert: Droid-monitor created revert due to Build breakage in b/338253720. Will be verifying through ABTD before submission. Reverted changes: /q/submissionid:27162921-configurable_enabled_property Change-Id: I2d144f9d297373a13a1190b173d10c966181ad84 --- java/bootclasspath.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'java/bootclasspath.go') diff --git a/java/bootclasspath.go b/java/bootclasspath.go index 77ddf5c05..c7dc3afae 100644 --- a/java/bootclasspath.go +++ b/java/bootclasspath.go @@ -127,10 +127,7 @@ func reportMissingVariationDependency(ctx android.BottomUpMutatorContext, variat // added by addDependencyOntoApexModulePair. func gatherApexModulePairDepsWithTag(ctx android.BaseModuleContext, tag blueprint.DependencyTag) []android.Module { var modules []android.Module - isActiveModulePred := func(module android.Module) bool { - return isActiveModule(ctx, module) - } - ctx.VisitDirectDepsIf(isActiveModulePred, func(module android.Module) { + ctx.VisitDirectDepsIf(isActiveModule, func(module android.Module) { t := ctx.OtherModuleDependencyTag(module) if t == tag { modules = append(modules, module) -- cgit v1.2.3-59-g8ed1b