Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf8a05bb authored by Janis Danisevskis's avatar Janis Danisevskis
Browse files

Keystore 2.0: Remove keystore and keystore2.enable property. 

* Remove keystore as build target.
* Remove the default setting of the keystore2.enable property.

Bug: 171563717
Test: N/A
Change-Id: I2f29d18650a5e2b819985d202cb0c4002bbe94de
parent 306a6d1f

target/product/base_system.mk

+0 −5
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ PRODUCT_PACKAGES += \ 
    iptables \

    ip-up-vpn \

    javax.obex \

    keystore \

    keystore2 \

    credstore \

    ld.mc \
@@ -401,8 +400,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)