diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/bootclasspath_fragment.go | 6 | ||||
| -rw-r--r-- | java/dexpreopt.go | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index bef3b58c8..fe4cc7685 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -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) { diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 1c63e3f24..4734357ab 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -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 |