Merge "Keystore 2.0: Enable keystore2 by default" am: 306a6d1fcc

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

Change-Id: I1d620c187e57f2b73c816638111fbb7361239ea3
This commit is contained in:
Treehugger Robot
2021-03-19 16:25:27 +00:00
committed by Automerger Merge Worker

View File

@@ -403,6 +403,6 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
# 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
PRODUCT_SYSTEM_PROPERTIES += persist.android.security.keystore2.enable=true
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)