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

Merge "Merge Android 12 QPR1"

Browse Source
This commit is contained in:
Xin Li
2021-12-14 20:26:44 +00:00
committed by Gerrit Code Review
parent 90b0039a9d 0a9962fd9e
commit 46c84edacf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/android_soong_config_vars.mk
View File

@@ -88,7 +88,7 @@ else
# This sets the default for building ART APEXes from source rather than # This sets the default for building ART APEXes from source rather than
# prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in # prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in
# all other platform builds. # all other platform builds.
SOONG_CONFIG_art_module_source_build ?= false SOONG_CONFIG_art_module_source_build ?= true
endif endif
# Apex build mode variables # Apex build mode variables

2
core/version_defaults.mk
View File

@@ -85,7 +85,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 := 2021-11-05 PLATFORM_SECURITY_PATCH := 2021-11-05
endif endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH .KATI_READONLY := PLATFORM_SECURITY_PATCH