Drop some special casing of source vs prebuilt mainline selection
soong config vars are no longer needed to support the following two
special cases
1. Santized builds. google hwasan products have been updated to explicitly list
PRODUCT_MODULE_BUILD_FROM_SOURCE ag/26576335
2. Coverage builds. product specific overrides of build flags are not
possible, so apex_contributions.go has been special cased to ignore
prebuilts. Since RELEASE_APEX_CONTRIBUTIONS_* are now used to select
prebuilts of mainline modules, we can drop the special-case of
coverage builds in this .mk file
Bug: 308188056
Bug: 325666427
Test: lunch cf_x86_64_phone-next-userdebug && EMMA_INSTRUMENT=true m
nothing; # verified that no path exists between droid and the prebuilt
bt apex
Change-Id: Ide50e4463615fef5f540130f6a6bce50c00eddb8
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index ca87417..a3fe2ae 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -44,25 +44,6 @@
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})