Drop "prebuilt_" prefixes from names registered in ApexInfo.InApexXxx.

Neither InApexVariants nor InApexModules should have them. This allows
us to get rid of InApexVariantByBaseName as well.

Test: m nothing
Test: m nothing SOONG_CONFIG_art_module_source_build=false
Bug: 180325915
Change-Id: Icbe4e025ce1a4c8dd258ff95d326ca2f27905188
This commit is contained in:
Martin Stjernholm
2021-05-26 16:57:39 +01:00
parent bcf5304eab
commit be10503d3a
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
}