commit 02ae86343707b26fd381ce93dc6f6bb5afad3f04
author Shawn Willden <swillden@google.com> Tue Oct 31 11:09:59 2017 -0600
committer Shawn Willden <swillden@google.com> Tue Nov 14 08:09:06 2017 -0700
tree 4789417d6ff8bc48d3381b66ec45053772a39b0f
parent d370ecafbb66e0cac38de99a6621e1f540c12173

Add support for SW-only KM4 HAL

Test: VtsHalKeymasterV4_0TargtTest
Bug: 63931634
Change-Id: I0a5a553ff76c39903442e64d28b38e315b27e852

device.mk

diff --git a/device.mk b/device.mk
index 974552a..112cad4 100755
--- a/device.mk
+++ b/device.mk
@@ -179,6 +179,11 @@
 PRODUCT_PACKAGES += \
     android.hardware.health@2.0-service
 
+# Keymaster 4 (software only)
+PRODUCT_PACKAGES += \
+    android.hardware.keymaster@4.0-impl \
+    android.hardware.keymaster@4.0-service
+
 # Audio fluence, ns, aec property, voice and media volume steps
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.qc.sdk.audio.fluencetype=fluencepro \

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 6cd9ba8..87de464 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -168,6 +168,15 @@
         </interface>
     </hal>
     <hal format="hidl">
+        <name>android.hardware.keymaster</name>
+        <transport>hwbinder</transport>
+        <version>4.0</version>
+        <interface>
+            <name>IKeymaster</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
         <name>android.hardware.light</name>
         <transport>hwbinder</transport>
         <version>2.0</version>