StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make change and version bump to UP1A.230623.002

Browse Source 
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23770789'] into udc-release.

Change-Id: I27341f79fbee81f92c12876a50d302f26353a74c
This commit is contained in:
Android Build Coastguard Worker
2023-06-24 02:09:26 +00:00
parent 935e9fe499 a64a599f7b
commit ea79971f70
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/android_soong_config_vars.mk
View File

@@ -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})

2
core/build_id.mk
View File

@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is # (like "CRB01"). It must be a single word, and is
# capitalized by convention. # capitalized by convention.
BUILD_ID=UP1A.230623.001 BUILD_ID=UP1A.230623.002