Merge "Revert "DO NOT MERGE: Enable mainline prebuilts for device targets"" into aosp-main-future (df395d2d) · Commits · e / os / android_build

core/android_soong_config_vars.mk

+1 −13

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ $(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT)
		# Default behavior for the tree wrt building modules or using prebuilts. This
		# can always be overridden by setting the environment variable
		# MODULE_BUILD_FROM_SOURCE.
		BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false
		BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

		ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
		# Always use sources when building the framework with Java coverage or
		@@ -45,18 +45,6 @@ ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
		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})