diff options
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | manifest.xml | 10 | ||||
| -rw-r--r-- | sepolicy/vendor/file_contexts | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 25c80737..ea5d3f65 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -75,3 +75,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr) + +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@3.0-service-qti.rc) + diff --git a/manifest.xml b/manifest.xml index cafb00ce..90d2452c 100644 --- a/manifest.xml +++ b/manifest.xml @@ -161,18 +161,10 @@ <hal format="hidl"> <name>android.hardware.keymaster</name> <transport>hwbinder</transport> - <version>3.0</version> - <interface> - <name>IKeymasterDevice</name> - <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> <instance>strongbox</instance> </interface> </hal> diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index c388b5b7..a26d7bd3 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -180,7 +180,7 @@ /vendor/bin/hw/android\.hardware\.drm@1\.0-service\.widevine u:object_r:hal_drm_widevine_exec:s0 /vendor/bin/hw/android\.hardware\.drm@1\.1-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0 /vendor/bin/hw/android\.hardware\.vibrator@1\.2-service\.crosshatch u:object_r:hal_vibrator_default_exec:s0 -/vendor/bin/hw/android\.hardware\.keymaster@3\.0-service-qti u:object_r:hal_keymaster_qti_exec:s0 +/vendor/bin/hw/android\.hardware\.keymaster@4\.0-service-qti u:object_r:hal_keymaster_qti_exec:s0 /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service-qti u:object_r:hal_gatekeeper_qti_exec:s0 /vendor/bin/hw/android\.hardware\.gnss@1\.1-service-qti u:object_r:hal_gnss_qti_exec:s0 /vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service-qti u:object_r:hal_bluetooth_default_exec:s0 |