Merge "Keystore 2.0: Remove keystore and keystore2.enable property."

This commit is contained in:
Janis Danisevskis
2021-04-07 19:30:12 +00:00
committed by Gerrit Code Review

View File

@@ -116,7 +116,6 @@ PRODUCT_PACKAGES += \
iptables \
ip-up-vpn \
javax.obex \
keystore \
keystore2 \
credstore \
ld.mc \
@@ -396,8 +395,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=true
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)