Merge "Remove keymaster4" into pi-dev

This commit is contained in:
TreeHugger Robot
2018-05-12 06:30:38 +00:00
committed by Android (Google) Code Review
3 changed files with 5 additions and 13 deletions

View File

@@ -187,3 +187,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.drm@
# Remove healthd
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/healthd)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/healthd.rc)
# Remove android.hardware.keymaster@4.0-service
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.keymaster@4.0-service)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.0-service.rc)

View File

@@ -188,10 +188,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
android.hardware.health@2.0-service.wahoo
# 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

@@ -169,15 +169,6 @@
<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>