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

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

Keystore 2.0: Disable keystore 2 by default (for now) 

Test: System starts without keystore 2 running.
Bug: 160623310
Change-Id: I83d54de602a0f70acc91fd8e55b07706e1b4e55b
parent 250a0420

target/product/base_system.mk

+4 −0
Original line number Diff line number Diff line
@@ -400,4 +400,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)