Restore KM4 reference HAL.

This is temporary, until we get the hardware implementation from
Qualcomm.  When we do, this reference implementation will be replaced.
Until then, keystore will notice this implementation when starting up,
but favor the hardware keymaster 3.0 implementation.  Engineers who
wish to do testing and development with the KM4 reference HAL on wahoo
can simply remove the hardware 3.0 implementation from the device.mk
file.  Keystore will then find no HW implementation and will load the
SW implementation.

Test: Boot and run KM4 VTS tests.
Change-Id: I1b7183b221041b55792200a2aa3e0ed974da2e0b
This commit is contained in:
Shawn Willden
2018-01-04 12:21:13 -07:00
parent c426d90f15
commit e6657935e8
2 changed files with 13 additions and 0 deletions

View File

@@ -178,6 +178,10 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
android.hardware.health@2.0-service
# Keymaster 4 (software only)
PRODUCT_PACKAGES += \
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 \

View File

@@ -167,6 +167,15 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.keymaster</name>
<transport>hwbinder</transport>
<version>4.0</version>
<interface>
<name>IKeymasterDevice</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.light</name>
<transport>hwbinder</transport>