Remove fallback code path for missing BCP fragments that is no longer

necessary.

#codehealth

Test: m nothing
Bug: 179354495
Change-Id: Iaddf163e69b52cef82d522311e81bef9bdb4aa8d
This commit is contained in:
Martin Stjernholm
2021-09-08 21:56:18 +01:00
parent ca9bc98e0c
commit b1e61cb8bc
2 changed files with 31 additions and 33 deletions

View File

@@ -95,15 +95,6 @@ func addDependencyOntoApexModulePair(ctx android.BottomUpMutatorContext, apex st
if ctx.OtherModuleDependencyVariantExists(variations, prebuiltName) {
ctx.AddVariationDependencies(variations, tag, prebuiltName)
addedDep = true
} else if ctx.Config().AlwaysUsePrebuiltSdks() && len(variations) > 0 {
// TODO(b/179354495): Remove this code path once the Android build has been fully migrated to
// use bootclasspath_fragment properly.
// Some prebuilt java_sdk_library modules do not yet have an APEX variations so try and add a
// dependency on the non-APEX variant.
if ctx.OtherModuleDependencyVariantExists(nil, prebuiltName) {
ctx.AddVariationDependencies(nil, tag, prebuiltName)
addedDep = true
}
}
// If no appropriate variant existing for this, so no dependency could be added, then it is an