commit bde00d71ea0de72b0843e6ad158c555660cef082
author Janis Danisevskis <jdanis@google.com> Tue Mar 14 16:26:00 2017 -0700
committer Steven Moreland <smoreland@google.com> Thu Apr 06 19:38:48 2017 -0700
tree e92bc6ff9a5de6edfa13d92be9b9db166b35195a
parent 6d4b9334b6f29f57fa62eaf0ce12def0485646b8

Make keymaster binderized always

This patch adds the keyamster-service package to
device/google/marline/device-common.mk such that the
binderized keymaster hal service gets build.

In addition the HAL transport type for android.hardware.keymaster
is set to "hwbinder".

Bug: 35764921
Test: Boot the device and check the output of lshal. The keymaster
      service must be running and should have two clients: vold and
      keystore

Change-Id: I62c78ec17541675027204aeacb9fe0aa1c9df1f0

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 9dfb91e..aa3dc61 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -136,7 +136,8 @@
 
 # Keymaster HAL
 PRODUCT_PACKAGES += \
-    android.hardware.keymaster@3.0-impl
+    android.hardware.keymaster@3.0-impl \
+    android.hardware.keymaster@3.0-service
 
 # Usb HAL
 PRODUCT_PACKAGES += \

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 1f334cb..b62c73c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -140,7 +140,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
-        <transport arch="32+64">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>3.0</version>
         <interface>
             <name>IKeymasterDevice</name>