keystore: Run Wifi keystore HAL in keystore daemon
The wifi keystore hal will run in the context of the main keystore
daemon.
Also,
Use the new IKeystore::tryGetService() for retrieveing the HAL service.
Bug: 34603782
Test: Able to connect to wifi passpoint networks.
Change-Id: I1436ea83166e5ad17372d98b0fd699c0dd732a11
diff --git a/keystore/Android.mk b/keystore/Android.mk
index b379151..5d84565 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -49,6 +49,7 @@
libcutils \
libcrypto \
libhardware \
+ libwifikeystorehal \
libkeystore_binder \
liblog \
libsoftkeymaster \
@@ -60,7 +61,8 @@
libhwbinder \
libhidlbase \
libhidltransport \
- android.hardware.keymaster@3.0
+ android.hardware.keymaster@3.0 \
+ android.system.wifi.keystore@1.0
LOCAL_MODULE := keystore
LOCAL_MODULE_TAGS := optional
LOCAL_INIT_RC := keystore.rc