commit 3d5a2145294dc9e260587550e2ee657702a2c39c
author Janis Danisevskis <jdanis@google.com> Wed May 05 07:31:24 2021 -0700
committer Janis Danisevskis <jdanis@google.com> Wed May 05 14:26:04 2021 -0700
tree 08ef1a337dbb18fcc1ca938fd926ec013886635a
parent 7e13aa04ce6863f8530326d41106b69f32ef407c

Keystore 2.0: Add convenience API for watchdog module.

Also make use of watchdog toggleable with a feature flag.

Test: N/A
Change-Id: Ibdd14de09bfb31067313373805475a8998fd1c00

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 8d0f4e7..b7270b1 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -62,6 +62,9 @@
     shared_libs: [
         "libcutils",
     ],
+    features: [
+        "watchdog",
+    ],
 }
 
 rust_library {
@@ -91,6 +94,10 @@
         "libkeystore2_test_utils",
         "libnix",
     ],
+    // The test should always include watchdog.
+    features: [
+        "watchdog",
+    ],
 }
 
 rust_binary {