From 259cefaf0e66bd7e23f0d9c03e788f6506953ac2 Mon Sep 17 00:00:00 2001 From: Simon1511 Date: Thu, 21 Oct 2021 11:15:55 +0200 Subject: [PATCH] sm7125: Build samsung keymaster Change-Id: Ibab06aa84f3f5ce32c27b4c20a0da02907518f93 --- BoardConfigCommon.mk | 3 +++ common.mk | 3 ++- proprietary-files.txt | 4 ++++ sepolicy/vendor/file_contexts | 1 + vendor.prop | 4 ++++ 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index a004f44..dfd8999 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -144,6 +144,9 @@ USE_CUSTOM_AUDIO_POLICY := 1 USE_XML_AUDIO_POLICY_CONF := 1 AUDIOSERVER_MULTILIB := 32 +# Keymaster +TARGET_KEYMASTER_VARIANT := samsung + # HIDL manifests DEVICE_MANIFEST_FILE := $(COMMON_PATH)/configs/manifest.xml DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(COMMON_PATH)/configs/framework_compatibility_matrix.xml diff --git a/common.mk b/common.mk index d636319..9f777c9 100644 --- a/common.mk +++ b/common.mk @@ -165,7 +165,8 @@ PRODUCT_PACKAGES += \ # Keymaster PRODUCT_PACKAGES += \ - android.hardware.keymaster@4.0-service + android.hardware.keymaster@4.0-service.samsung \ + libkeymaster4_1support.vendor # Light PRODUCT_PACKAGES += \ diff --git a/proprietary-files.txt b/proprietary-files.txt index 7807a22..180684d 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -872,6 +872,10 @@ vendor/firmware/ipa_fws.b04 vendor/firmware/ipa_fws.elf vendor/firmware/ipa_fws.mdt +# Keymaster +vendor/lib64/libkeymaster_helper.so +-vendor/lib64/libskeymaster4device.so + # Machine learning vendor/lib64/libreffeature.so vendor/lib64/liblearningmodule.so diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 74e6c0f..280eb97 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -8,3 +8,4 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.sensors@2\.1-service.samsung-multihal u:object_r:hal_sensors_default_exec:s0 /(vendor|system/vendor)/bin/factory\.ssc u:object_r:factory_ssc_exec:s0 /(vendor|system/vendor)/bin/secril_config_svc u:object_r:vendor_secril_config_svc_exec:s0 +/(vendor|system/vendor)/bin/hw/android.hardware.keymaster@4.0-service.samsung u:object_r:hal_keymaster_default_exec:s0 diff --git a/vendor.prop b/vendor.prop index afe94c4..b18111c 100644 --- a/vendor.prop +++ b/vendor.prop @@ -120,6 +120,10 @@ ro.opengles.version=196610 # Gatekeeper ro.hardware.gatekeeper=mdfpp +# Keystore +ro.hardware.keystore=mdfpp +ro.security.keystore.keytype=sakv2,gak + # Media debug.stagefright.omx_default_rank=0 debug.stagefright.ccodec=1