commit 98dba54385fbe04cd677b23c90798fd01b06a902
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 19 16:59:35 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 19 16:59:35 2021 +0000
tree 5ec3865db8957a78ebd630ba2f0684d798d902e3
parent 306a6d1fcc6083f3d12c0c85e1e2c2e29b27e877
parent 2bf587713ba1a8e157c6d3b37f92ae58a64e8cac

Merge "Consolidate manifest_check for different module types."

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 09864bc..c87fb73 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -403,6 +403,6 @@
 
 # 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)