commit c5bbb1ead1d91c1b3db58908d8f5e64ac9aa7ae1
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 08 20:58:19 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 08 20:58:19 2021 +0000
tree 6f62de03d9c4f3199153c62bee7650627470d053
parent 7ef7116014a289e5047f2741308c9422b2d80472
parent 8e568c52ab2b4775275c27568354575242652751

Merge "Remove Use_lmkd_stats_log from build"

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index c7ae1f0..5238d40 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -400,4 +400,8 @@
 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)