From a9dd6faae5d43dc091a33071891faea80f0929b0 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 22 Apr 2021 17:25:57 +0100 Subject: [PATCH] Workaround build failure in coverage build The jacocoagent is special as while it is depended on by prebuilts it is not actually a prebuilt. Bug: 177892522 Bug: 186118711 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true nothing Previous command fails without this change and works with it. Change-Id: I8fba922fc40919936d74a6f95af745e37f1ca61f --- java/boot_image.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/boot_image.go b/java/boot_image.go index 192b16b40..a14538b62 100644 --- a/java/boot_image.go +++ b/java/boot_image.go @@ -219,7 +219,9 @@ func (b *BootImageModule) ComponentDepsMutator(ctx android.BottomUpMutatorContex for _, name := range b.properties.Contents { // A bootclasspath_fragment must depend only on other source modules, while the // prebuilt_bootclasspath_fragment must only depend on other prebuilt modules. - if !isSourceModule { + // + // TODO(b/177892522) - avoid special handling of jacocoagent. + if !isSourceModule && name != "jacocoagent" { name = android.PrebuiltNameFromSource(name) } ctx.AddDependency(module, bootclasspathFragmentContentDepTag, name)