summaryrefslogtreecommitdiff
path: root/java/bootclasspath.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-05-07 17:49:10 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-05-07 17:49:10 +0000
commit3f01580c04bfe37c920e247015cce93cff2451c0 (patch)
treeb2165cd64e2876d8fa4c60bd322de81364143aed /java/bootclasspath.go
parent0d4a9ca79225bac10e4b62a663ee0cd09e3b314d (diff)
parenta963b94cde194257fa67ce9596026a4da2fe7523 (diff)
Merge "Make the enabled property configurable" into main
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)