diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 4e42a219a6..29fb7aa598 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -44,25 +44,6 @@ ifeq (,$(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE)) BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false endif -ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),) - # Always use sources when building the framework with Java coverage or - # sanitized builds as they both require purpose built prebuilts which we do - # not provide. - BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true -endif - -ifneq ($(CLANG_COVERAGE)$(NATIVE_COVERAGE_PATHS),) - # Always use sources when building with clang coverage and native coverage. - # It is possible that there are certain situations when building with coverage - # would work with prebuilts, e.g. when the coverage is not being applied to - # modules for which we provide prebuilts. Unfortunately, determining that - # would require embedding knowledge of which coverage paths affect which - # modules here. That would duplicate a lot of information, add yet another - # location module authors have to update and complicate the logic here. - # For nowe we will just always build from sources when doing coverage builds. - BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true -endif - # ART does not provide linux_bionic variants needed for products that # set HOST_CROSS_OS=linux_bionic. ifeq (linux_bionic,${HOST_CROSS_OS})