Merge "Keystore 2.0: Enable keystore2 by default" into sc-dev

This commit is contained in:
Janis Danisevskis 2021-03-18 05:12:56 +00:00 committed by Android (Google) Code Review
commit c141b98eb6
1 changed files with 0 additions and 4 deletions

View File

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