commit 95799b056ed36ffff5382fe79613e40ab99a426b
author Janis Danisevskis <jdanis@google.com> Fri Sep 11 09:47:45 2020 -0700
committer Janis Danisevskis <jdanis@google.com> Wed Oct 28 19:40:51 2020 -0700
tree 1bd6eb284e3574fce2679bc45815c7c707877d06
parent b979b79bd95937a55b806fb1b6210babce2ca0d7

Add keystore2 to PLATFORM_PACKAGES

Add keystore 2 to the PLATFORM_PACKAGES in anticipation for the Keystore
2.0 migration. This builds and installs keystore2 on the device, but it
does not get started yet. Staring keystore2 is currently controlled with
the platform property ro.android.security.keystore2.enable=true.

Bug: 171305684
Test: keystore2 builds and is present on the device but does not start
      unconditionally.
Change-Id: Id92cb2aa38022516067853d89d6c3210db1100a8

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 1a28cf0..b7e1064 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -117,6 +117,7 @@
     ip-up-vpn \
     javax.obex \
     keystore \
+    keystore2 \
     credstore \
     ld.mc \
     libaaudio \