diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-12 06:30:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-12 06:30:38 +0000 |
| commit | aa3901b33e9be84568ba1c81eb853d5a5848ff23 (patch) | |
| tree | 13c7680e577ee8ee1d841050a8838ff60e5ed127 | |
| parent | 55e9c926f4dd9ab76b7fe4f4942148d76982846b (diff) | |
| parent | 2f1fec3c6ffacda7fc033926d7d86abf01ea3ba2 (diff) | |
| download | device_google_wahoo-aa3901b33e9be84568ba1c81eb853d5a5848ff23.tar.gz device_google_wahoo-aa3901b33e9be84568ba1c81eb853d5a5848ff23.tar.bz2 device_google_wahoo-aa3901b33e9be84568ba1c81eb853d5a5848ff23.zip | |
Merge "Remove keymaster4" into pi-dev
| -rw-r--r-- | CleanSpec.mk | 5 | ||||
| -rwxr-xr-x | device.mk | 4 | ||||
| -rw-r--r-- | manifest.xml | 9 |
3 files changed, 5 insertions, 13 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index fe253e4d..aa65532f 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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) + @@ -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 \ diff --git a/manifest.xml b/manifest.xml index 8a7986d8..a1a0322a 100644 --- a/manifest.xml +++ b/manifest.xml @@ -170,15 +170,6 @@ </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> <version>2.0</version> |