Revert "Add a coverage suffix to avoid Ninja file regeneration."
Revert submission 3207217-emma-flip-time-saver
Reason for revert: b/361236607
Reverted changes: /q/submissionid:3207217-emma-flip-time-saver
Change-Id: I7b4dcd3f6e73e302a2c3ef7ed5c02f6345619463
diff --git a/ui/build/config.go b/ui/build/config.go
index b64a65f..631b76f 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -1041,7 +1041,7 @@
func (c *configImpl) UsedEnvFile(tag string) string {
if v, ok := c.environ.Get("TARGET_PRODUCT"); ok {
- return shared.JoinPath(c.SoongOutDir(), usedEnvFile+"."+v+c.CoverageSuffix()+"."+tag)
+ return shared.JoinPath(c.SoongOutDir(), usedEnvFile+"."+v+"."+tag)
}
return shared.JoinPath(c.SoongOutDir(), usedEnvFile+"."+tag)
}
@@ -1149,13 +1149,6 @@
return "", fmt.Errorf("TARGET_PRODUCT is not defined")
}
-func (c *configImpl) CoverageSuffix() string {
- if v := c.environ.IsEnvTrue("EMMA_INSTRUMENT"); v {
- return ".coverage"
- }
- return ""
-}
-
func (c *configImpl) TargetDevice() string {
return c.targetDevice
}
@@ -1528,7 +1521,7 @@
if err != nil {
return filepath.Join(c.SoongOutDir(), "soong.variables")
} else {
- return filepath.Join(c.SoongOutDir(), "soong."+targetProduct+c.CoverageSuffix()+".variables")
+ return filepath.Join(c.SoongOutDir(), "soong."+targetProduct+".variables")
}
}
@@ -1537,7 +1530,7 @@
if err != nil {
return filepath.Join(c.SoongOutDir(), "soong.extra.variables")
} else {
- return filepath.Join(c.SoongOutDir(), "soong."+targetProduct+c.CoverageSuffix()+".extra.variables")
+ return filepath.Join(c.SoongOutDir(), "soong."+targetProduct+".extra.variables")
}
}
@@ -1546,7 +1539,7 @@
if err != nil {
return filepath.Join(c.SoongOutDir(), "build.ninja")
} else {
- return filepath.Join(c.SoongOutDir(), "build."+targetProduct+c.CoverageSuffix()+".ninja")
+ return filepath.Join(c.SoongOutDir(), "build."+targetProduct+".ninja")
}
}
@@ -1558,11 +1551,11 @@
}
func (c *configImpl) SoongAndroidMk() string {
- return filepath.Join(c.SoongOutDir(), "Android-"+c.TargetProduct()+c.CoverageSuffix()+".mk")
+ return filepath.Join(c.SoongOutDir(), "Android-"+c.TargetProduct()+".mk")
}
func (c *configImpl) SoongMakeVarsMk() string {
- return filepath.Join(c.SoongOutDir(), "make_vars-"+c.TargetProduct()+c.CoverageSuffix()+".mk")
+ return filepath.Join(c.SoongOutDir(), "make_vars-"+c.TargetProduct()+".mk")
}
func (c *configImpl) SoongBuildMetrics() string {
diff --git a/ui/build/kati.go b/ui/build/kati.go
index 5743ff7..a0efd2c 100644
--- a/ui/build/kati.go
+++ b/ui/build/kati.go
@@ -41,7 +41,7 @@
// arguments.
func genKatiSuffix(ctx Context, config Config) {
// Construct the base suffix.
- katiSuffix := "-" + config.TargetProduct() + config.CoverageSuffix()
+ katiSuffix := "-" + config.TargetProduct()
// Append kati arguments to the suffix.
if args := config.KatiArgs(); len(args) > 0 {