Merge changes I505a7ad8,I92d88199 into main am: fae5ec8bbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3258011 Change-Id: I227940176b231d987f6b8481e624af178c7d3d5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -463,6 +463,12 @@ func (b *BootclasspathFragmentModule) DepsMutator(ctx android.BottomUpMutatorCon
|
||||
// Add a dependency onto the dex2oat tool which is needed for creating the boot image. The
|
||||
// path is retrieved from the dependency by GetGlobalSoongConfig(ctx).
|
||||
dexpreopt.RegisterToolDeps(ctx)
|
||||
|
||||
// Add a dependency to `all_apex_contributions` to determine if prebuilts are active.
|
||||
// If prebuilts are active, `contents` validation on the source bootclasspath fragment should be disabled.
|
||||
if _, isPrebuiltModule := ctx.Module().(*PrebuiltBootclasspathFragmentModule); !isPrebuiltModule {
|
||||
ctx.AddDependency(b, android.AcDepTag, "all_apex_contributions")
|
||||
}
|
||||
}
|
||||
|
||||
func (b *BootclasspathFragmentModule) BootclasspathDepsMutator(ctx android.BottomUpMutatorContext) {
|
||||
|
@@ -209,13 +209,18 @@ func disableSourceApexVariant(ctx android.BaseModuleContext) bool {
|
||||
psi = prebuiltSelectionInfo
|
||||
}
|
||||
})
|
||||
|
||||
// Find the apex variant for this module
|
||||
var apexVariantsWithoutTestApexes []string
|
||||
apexVariantsWithoutTestApexes := []string{}
|
||||
if apexInfo.BaseApexName != "" {
|
||||
// This is a transitive dependency of an override_apex
|
||||
apexVariantsWithoutTestApexes = []string{apexInfo.BaseApexName}
|
||||
apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, apexInfo.BaseApexName)
|
||||
} else {
|
||||
_, apexVariantsWithoutTestApexes, _ = android.ListSetDifference(apexInfo.InApexVariants, apexInfo.TestApexes)
|
||||
_, variants, _ := android.ListSetDifference(apexInfo.InApexVariants, apexInfo.TestApexes)
|
||||
apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, variants...)
|
||||
}
|
||||
if apexInfo.ApexAvailableName != "" {
|
||||
apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, apexInfo.ApexAvailableName)
|
||||
}
|
||||
disableSource := false
|
||||
// find the selected apexes
|
||||
|
Reference in New Issue
Block a user