From 3234ef466c1105ee54acdd2bc55f11a1129a8e51 Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Wed, 6 Aug 2025 20:56:46 +0800
Subject: [PATCH] sm8750-common: Build AOSP NXP keymint HAL

 * config.fs is adjusted to match AOSP module naming

Change-Id: I29be1e62a404793cf0de0d3bab5b07a8e1adf70c
---
 common.mk | 4 +++-
 config.fs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common.mk b/common.mk
index 25cc97e..a6f13af 100644
--- a/common.mk
+++ b/common.mk
@@ -242,7 +242,9 @@ PRODUCT_COPY_FILES += \
 
 # Keymint
 PRODUCT_PACKAGES += \
-    android.hardware.hardware_keystore_V3.xml
+    android.hardware.hardware_keystore_V3.xml \
+    android.hardware.security.keymint3-service.strongbox.nxp \
+    android.hardware.weaver-service.nxp
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.keystore.app_attest_key.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.keystore.app_attest_key.xml \
diff --git a/config.fs b/config.fs
index e02e0c8..7f95c62 100644
--- a/config.fs
+++ b/config.fs
@@ -49,7 +49,7 @@ value:2916
 [AID_VENDOR_THALES_AUTHSECRET]
 value:2917
 
-[vendor/bin/hw/android.hardware.security.keymint-service.strongbox-nxp]
+[vendor/bin/hw/android.hardware.security.keymint3-service.strongbox.nxp]
 mode: 0755
 user: AID_VENDOR_NXP_STRONGBOX
 group: AID_SYSTEM