diff options
| author | 2021-04-22 17:25:57 +0100 | |
|---|---|---|
| committer | 2021-04-22 17:31:50 +0100 | |
| commit | a9dd6faae5d43dc091a33071891faea80f0929b0 (patch) | |
| tree | c9d4736d5baed4745f1f7de2c96369bc8fbc9260 | |
| parent | 57d13c6892e42f4dd4b72dbb82ab15aa3ca3a7fd (diff) | |
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
| -rw-r--r-- | java/boot_image.go | 4 |
1 files changed, 3 insertions, 1 deletions
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) |