commit 1bc40c56b9f9f02191d14bf9812101e0ae55bb2f
author Kun Niu <kunniu@google.com> Mon Jul 29 16:28:57 2019 -0700
committer Kun Niu <kunniu@google.com> Mon Aug 05 13:36:20 2019 -0700
tree bc22a17ebb80eeace1ed5aa7723326088b9fabad
parent 895e224d8fad6877918ef05545d7423a30d72c2b

Build module from source branch instead of using prebuilds when coverage is enabled.

Test: successfully get coverage data from coverage build.
Bug: 137865099
Change-Id: I7df96c2b2c2ec2859393fb2c19ffe1081d112c96
Merged-In: I7df96c2b2c2ec2859393fb2c19ffe1081d112c96

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 87c54f3..69a50f1 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1335,6 +1335,10 @@
 	// 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
 	forceDisable = forceDisable || android.InList("address", ctx.Config().SanitizeDevice()) ||
 		android.InList("hwaddress", ctx.Config().SanitizeDevice())