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

Merge "Merge UP1A.230905.019" into aosp-main-future

Browse Source
This commit is contained in:
Xin Li
2023-09-05 18:36:11 +00:00
committed by Android (Google) Code Review
parent 6a5b171816 3a846b926f
commit 236f2cd5e3
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

@@ -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 # 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
@@ -45,6 +45,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/version_defaults.mk
View File

@@ -105,7 +105,7 @@ ifndef PLATFORM_SECURITY_PATCH
# It must be of the form "YYYY-MM-DD" on production devices. # It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2023-08-05 PLATFORM_SECURITY_PATCH := 2023-09-05
endif endif
include $(BUILD_SYSTEM)/version_util.mk include $(BUILD_SYSTEM)/version_util.mk