sm7125: Build samsung keymaster

Change-Id: Ibab06aa84f3f5ce32c27b4c20a0da02907518f93

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

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 += \

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

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

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