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: Id2e415232221baf2015b8170ceb64ee6f8d3f160
diff --git a/core/config.mk b/core/config.mk
index b011101..ae65944 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1252,15 +1252,8 @@
# consistency with those defined in BoardConfig.mk files.
include $(BUILD_SYSTEM)/android_soong_config_vars.mk
-# EMMA_INSTRUMENT is set to true when coverage is enabled. Creates a suffix to
-# differeciate the coverage version of ninja files. This will save 5 minutes of
-# build time used to regenerate ninja.
-ifeq (true,$(EMMA_INSTRUMENT))
-COVERAGE_SUFFIX := .coverage
-endif
-
-SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).variables
-SOONG_EXTRA_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).extra.variables
+SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT).variables
+SOONG_EXTRA_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT).extra.variables
ifeq ($(CALLED_FROM_SETUP),true)
include $(BUILD_SYSTEM)/ninja_config.mk