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

Commit b6676298 authored by Kun Niu's avatar Kun Niu Committed by Automerger Merge Worker
Browse files

Merge "Use prebuild modules even when coverage is enabled." into sc-dev am: fe1d6c53 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15472697

Change-Id: I82893d0059d77e6d65cb0fa5b3f2bbd01a60c2cb
parents c430022a fe1d6c53

apex/prebuilt.go

+0 −4
Original line number Diff line number Diff line
@@ -133,10 +133,6 @@ func (p *prebuiltCommon) checkForceDisable(ctx android.ModuleContext) bool { 
	// to build the prebuilts themselves.

	forceDisable = forceDisable || ctx.Config().UnbundledBuild()



	// Force disable the prebuilts when coverage is enabled.

	forceDisable = forceDisable || ctx.DeviceConfig().NativeCoverageEnabled()

	forceDisable = forceDisable || ctx.Config().IsEnvTrue("EMMA_INSTRUMENT")



	// b/137216042 don't use prebuilts when address sanitizer is on, unless the prebuilt has a sanitized source

	sanitized := ctx.Module().(sanitizedPrebuilt)

	forceDisable = forceDisable || (android.InList("address", ctx.Config().SanitizeDevice()) && !sanitized.hasSanitizedSource("address"))