Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9dd6faa authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent 57d13c68

java/boot_image.go

+3 −1
Original line number Diff line number Diff line
@@ -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)