From 36c329ce771a0ff54f1109a4196748ec5423075a Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Mon, 29 Apr 2024 20:41:56 +0000 Subject: Move coverage builds prebuilt special case to make Having this in make has the following advantages - allows this to be used in other places in make that are sensitive to prebuilt selection, e.g. apex boot jars that are present in source but not in prebuilt apexes - collocates the various prebuilt special edge cases Test: presubmits Test: in internal, lunch cf_x86_64_phone-next-userdebug Test: EMMA_INSTRUMENT_FRAMEWORK=true get_build_var PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS true Bug: 308188056 Change-Id: Iea92311759f3bfe0ece7cb45fdb239c8a4db1dde Merged-In: Iea92311759f3bfe0ece7cb45fdb239c8a4db1dde --- android/apex_contributions.go | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'android/apex_contributions.go') diff --git a/android/apex_contributions.go b/android/apex_contributions.go index dd09fbf44..f5c50d386 100644 --- a/android/apex_contributions.go +++ b/android/apex_contributions.go @@ -15,8 +15,6 @@ package android import ( - "strings" - "github.com/google/blueprint" "github.com/google/blueprint/proptools" ) @@ -115,15 +113,6 @@ func (a *allApexContributions) DepsMutator(ctx BottomUpMutatorContext) { func (a *allApexContributions) SetPrebuiltSelectionInfoProvider(ctx BaseModuleContext) { addContentsToProvider := func(p *PrebuiltSelectionInfoMap, m *apexContributions) { for _, content := range m.Contents() { - // Coverage builds for TARGET_RELEASE=foo should always build from source, - // even if TARGET_RELEASE=foo uses prebuilt mainline modules. - // This is necessary because the checked-in prebuilts were generated with - // instrumentation turned off. - // - // Skip any prebuilt contents in coverage builds - if strings.HasPrefix(content, "prebuilt_") && (ctx.Config().JavaCoverageEnabled() || ctx.DeviceConfig().NativeCoverageEnabled()) { - continue - } if !ctx.OtherModuleExists(content) && !ctx.Config().AllowMissingDependencies() { ctx.ModuleErrorf("%s listed in apex_contributions %s does not exist\n", content, m.Name()) } -- cgit v1.2.3-59-g8ed1b