DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789 Change-Id: Ie3aec79065a2e38ab35e8df4c0f55989c3697277 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -40,7 +40,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
|
# Default behavior for the tree wrt building modules or using prebuilts. This
|
||||||
# can always be overridden by setting the environment variable
|
# can always be overridden by setting the environment variable
|
||||||
# MODULE_BUILD_FROM_SOURCE.
|
# MODULE_BUILD_FROM_SOURCE.
|
||||||
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
|
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false
|
||||||
|
|
||||||
ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
|
ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
|
||||||
# Always use sources when building the framework with Java coverage or
|
# Always use sources when building the framework with Java coverage or
|
||||||
@@ -49,6 +49,18 @@ ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
|
|||||||
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
|
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
|
||||||
endif
|
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
|
# ART does not provide linux_bionic variants needed for products that
|
||||||
# set HOST_CROSS_OS=linux_bionic.
|
# set HOST_CROSS_OS=linux_bionic.
|
||||||
ifeq (linux_bionic,${HOST_CROSS_OS})
|
ifeq (linux_bionic,${HOST_CROSS_OS})
|
||||||
|
Reference in New Issue
Block a user