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

Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Browse Source 
Bug: 205056467
Merged-In: I42fd618b5a018abd57e6eab4fe4ed6ba9f70a235
Change-Id: I5e0d686c2a1cc15e6a3115243f3a83cb070b111c
This commit is contained in:
Xin Li
2021-11-15 23:30:54 +00:00
parent 4acd14b291 d540a6b9fe
commit b461e822a1
3 changed files with 8 additions and 4 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

8
target/product/gsi_release.mk
View File

@@ -62,8 +62,12 @@ PRODUCT_PACKAGES += \
init.gsi.rc \ init.gsi.rc \
init.vndk-nodef.rc \ init.vndk-nodef.rc \
# Support additional P, Q and R VNDK packages # Support additional VNDK snapshots
PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30 PRODUCT_EXTRA_VNDK_VERSIONS := \
28 \
29 \
30 \
31 \
# Do not build non-GSI partition images. # Do not build non-GSI partition images.
PRODUCT_BUILD_CACHE_IMAGE := false PRODUCT_BUILD_CACHE_IMAGE := false