From 58d10900322d8cfe4c810101436035f5e9cd498c Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Sat, 28 Mar 2020 14:43:19 +0900
Subject: [PATCH] Don't run apex_available check for coverage builds

Coverage build adds extra dependencies for the runtime libs. Marking
them and their transitive dependenciese with apex_available doesn't make
any value; it instead adds noise.

Bug: 150999716
Test: m
Change-Id: I08e51cec1de6ded624ef9d4c41c1e5b2e611ff38
---
 apex/apex.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apex/apex.go b/apex/apex.go
index 46aaa8b5f..ebc59694e 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -2023,6 +2023,13 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) {
 		return
 	}
 
+	// Coverage build adds additional dependencies for the coverage-only runtime libraries.
+	// Requiring them and their transitive depencies with apex_available is not right
+	// because they just add noise.
+	if ctx.Config().IsEnvTrue("EMMA_INSTRUMENT") || a.IsNativeCoverageNeeded(ctx) {
+		return
+	}
+
 	a.walkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) {
 		apexName := ctx.ModuleName()
 		fromName := ctx.OtherModuleName(from)