Merge "Drop "prebuilt_" prefixes from names registered in ApexInfo.InApexXxx." am: 664b2cf89a am: 5eb4b21deb

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1719298

Change-Id: I72b64b8f26bdb135838f8cf735b2ac7da84cdba7
This commit is contained in:
Martin Stjernholm
2021-05-27 10:14:36 +00:00
committed by Automerger Merge Worker
3 changed files with 5 additions and 17 deletions

View File

@@ -171,7 +171,7 @@ func isModuleInConfiguredList(ctx android.BaseModuleContext, module android.Modu
// A platform variant is required but this is for an apex so ignore it.
return false
}
} else if !apexInfo.InApexVariantByBaseName(requiredApex) {
} else if !apexInfo.InApexVariant(requiredApex) {
// An apex variant for a specific apex is required but this is the wrong apex.
return false
}