Make change and version bump to UP1A.230623.002
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23770789'] into udc-release. Change-Id: I27341f79fbee81f92c12876a50d302f26353a74c
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
|
||||
# can always be overridden by setting the environment variable
|
||||
# MODULE_BUILD_FROM_SOURCE.
|
||||
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
|
||||
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false
|
||||
|
||||
ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
|
||||
# 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
|
||||
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})
|
||||
|
@@ -18,4 +18,4 @@
|
||||
# (like "CRB01"). It must be a single word, and is
|
||||
# capitalized by convention.
|
||||
|
||||
BUILD_ID=UP1A.230623.001
|
||||
BUILD_ID=UP1A.230623.002
|
||||
|
Reference in New Issue
Block a user