p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Keystore 2.0: Disable keystore 2 by default (for now)" am: 7ef7116014 am: 38aea6ebe4 am: 13ad4052b9 

Original change: https://android-review.googlesource.com/c/platform/build/+/1578147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85a61be24bfd40b8fb6f788a1c75fcf2d7bcb2ee
This commit is contained in:
Treehugger Robot 2021-02-08 21:39:26 +00:00 committed by Automerger Merge Worker
parent 775196bd87 13ad4052b9
commit a06d7685a8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/base_system.mk
View File

@ -405,4 +405,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)