diff options
| -rw-r--r-- | core/soong_config.mk | 3 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/soong_config.mk b/core/soong_config.mk index ae494c4ff1..ac085e21a8 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -170,6 +170,7 @@ $(call add_json_list, NamespacesToExport, $(PRODUCT_SOONG_NAMESPA $(call add_json_list, PgoAdditionalProfileDirs, $(PGO_ADDITIONAL_PROFILE_DIRS)) +$(call add_json_list, BoardReqdMaskPolicy, $(BOARD_REQD_MASK_POLICY)) $(call add_json_list, BoardVendorSepolicyDirs, $(BOARD_VENDOR_SEPOLICY_DIRS) $(BOARD_SEPOLICY_DIRS)) $(call add_json_list, BoardOdmSepolicyDirs, $(BOARD_ODM_SEPOLICY_DIRS)) $(call add_json_list, BoardVendorDlkmSepolicyDirs, $(BOARD_VENDOR_DLKM_SEPOLICY_DIRS)) @@ -178,8 +179,10 @@ $(call add_json_list, BoardOdmDlkmSepolicyDirs, $(BOARD_ODM_DLKM_SEPOLI $(call add_json_list, SystemExtPublicSepolicyDirs, $(SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS) $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR)) $(call add_json_list, SystemExtPrivateSepolicyDirs, $(SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS) $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR)) $(call add_json_list, BoardSepolicyM4Defs, $(BOARD_SEPOLICY_M4DEFS)) +$(call add_json_str, BoardSepolicyVers, $(BOARD_SEPOLICY_VERS)) $(call add_json_bool, Flatten_apex, $(filter true,$(TARGET_FLATTEN_APEX))) +$(call add_json_bool, ForceApexSymlinkOptimization, $(filter true,$(TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION))) $(call add_json_str, DexpreoptGlobalConfig, $(DEX_PREOPT_CONFIG)) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 22eb1e1d70..fe901654fb 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2020-12-05 + PLATFORM_SECURITY_PATCH := 2021-01-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH |