diff --git a/android/apex_contributions.go b/android/apex_contributions.go index 89e27b97b9..c388afff9a 100644 --- a/android/apex_contributions.go +++ b/android/apex_contributions.go @@ -15,6 +15,8 @@ package android import ( + "strings" + "github.com/google/blueprint" "github.com/google/blueprint/proptools" ) @@ -102,6 +104,15 @@ func (a *allApexContributions) SetPrebuiltSelectionInfoProvider(ctx BaseModuleCo if InList(content, ctx.Config().BuildIgnoreApexContributionContents()) { continue } + // 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()) } diff --git a/android/prebuilt_test.go b/android/prebuilt_test.go index 4a696283be..2241b08153 100644 --- a/android/prebuilt_test.go +++ b/android/prebuilt_test.go @@ -762,3 +762,45 @@ func TestPrebuiltErrorCannotListBothSourceAndPrebuiltInContributions(t *testing. } `, selectMainlineModuleContritbutions) } + +// Test that apex_contributions of prebuilt modules are ignored in coverage builds +func TestSourceIsSelectedInCoverageBuilds(t *testing.T) { + prebuiltMainlineContributions := GroupFixturePreparers( + FixtureModifyProductVariables(func(variables FixtureProductVariables) { + variables.BuildFlags = map[string]string{ + "RELEASE_APEX_CONTRIBUTIONS_ADSERVICES": "my_prebuilt_apex_contributions", + } + }), + FixtureMergeEnv(map[string]string{ + "EMMA_INSTRUMENT_FRAMEWORK": "true", + }), + ) + bp := ` + source { + name: "foo", + } + prebuilt { + name: "foo", + srcs: ["prebuilt_file"], + } + apex_contributions { + name: "my_prebuilt_apex_contributions", + api_domain: "my_mainline_module", + contents: [ + "prebuilt_foo", + ], + } + all_apex_contributions { + name: "all_apex_contributions", + } + ` + ctx := GroupFixturePreparers( + PrepareForTestWithArchMutator, + PrepareForTestWithPrebuilts, + FixtureRegisterWithContext(registerTestPrebuiltModules), + prebuiltMainlineContributions).RunTestWithBp(t, bp) + source := ctx.ModuleForTests("foo", "android_common").Module() + AssertBoolEquals(t, "Source should be preferred in coverage builds", true, !source.IsHideFromMake()) + prebuilt := ctx.ModuleForTests("prebuilt_foo", "android_common").Module() + AssertBoolEquals(t, "Prebuilt should not be preferred in coverage builds", false, !prebuilt.IsHideFromMake()) +}