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

Merge "Keystore 2.0: Disable keystore 2 by default (for now)"

Browse Source
This commit is contained in:
Treehugger Robot
2021-02-08 20:04:38 +00:00
committed by Gerrit Code Review
parent bff5273dd0 a3c5395672
commit 7ef7116014
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/base_system.mk
View File

@@ -400,4 +400,8 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects)
# This property allows enabling Keystore 2.0 selectively for testing.
# TODO Remove when Keystore 2.0 migration is complete. b/171563717
PRODUCT_SYSTEM_PROPERTIES += persist.android.security.keystore2.enable=false
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)