summaryrefslogtreecommitdiff
path: root/java/bootclasspath.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-05-01 19:33:59 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-05-01 19:33:59 +0000
commit1256e6f47ad2e2ae5eccefea98c61f85396e800f (patch)
tree7fad202a89bfb4efe98bea8b06c13b20861a19cf /java/bootclasspath.go
parent72a12da662a602d7f69186e2efc4a1e7702be504 (diff)
parent0e0d7490625c713bb71c254bd55129b0a30898a3 (diff)
Merge "Make the enabled property configurable" into aosp-main-future
Diffstat (limited to 'java/bootclasspath.go')
-rw-r--r--java/bootclasspath.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/bootclasspath.go b/java/bootclasspath.go
index c7dc3afae..77ddf5c05 100644
--- a/java/bootclasspath.go
+++ b/java/bootclasspath.go
@@ -127,7 +127,10 @@ func reportMissingVariationDependency(ctx android.BottomUpMutatorContext, variat
// added by addDependencyOntoApexModulePair.
func gatherApexModulePairDepsWithTag(ctx android.BaseModuleContext, tag blueprint.DependencyTag) []android.Module {
var modules []android.Module
- ctx.VisitDirectDepsIf(isActiveModule, func(module android.Module) {
+ isActiveModulePred := func(module android.Module) bool {
+ return isActiveModule(ctx, module)
+ }
+ ctx.VisitDirectDepsIf(isActiveModulePred, func(module android.Module) {
t := ctx.OtherModuleDependencyTag(module)
if t == tag {
modules = append(modules, module)