From 62600d856187ba64ed98045169a069610ed12143 Mon Sep 17 00:00:00 2001
From: chaptsand <chaptsand@gmail.com>
Date: Sun, 30 Mar 2025 00:26:21 +0800
Subject: [PATCH] sm8550-common: Enable broken dup rules check

Change-Id: I9a80f6246410d1571ea44990ff573a931556e1e4
---
 BoardConfigCommon.mk                           |  2 --
 common.mk                                      |  4 +++-
 ...android.hardware.hardware_keystore_v200.xml | 18 ------------------
 extract-files.py                               |  2 +-
 proprietary-files.txt                          |  5 +----
 5 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 configs/permissions/android.hardware.hardware_keystore_v200.xml

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index bdd6e9e..bf3a667 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-BUILD_BROKEN_DUP_RULES := true
-
 COMMON_PATH := device/samsung/sm8550-common
 
 # Architecture
diff --git a/common.mk b/common.mk
index 84ed279..497be51 100644
--- a/common.mk
+++ b/common.mk
@@ -181,8 +181,10 @@ PRODUCT_PACKAGES += \
     init.samsung.rc
 
 # Keymint
+PRODUCT_PACKAGES += \
+    android.hardware.hardware_keystore.xml
+
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/permissions/android.hardware.hardware_keystore_v200.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hardware_keystore.xml \
     $(LOCAL_PATH)/configs/permissions/android.hardware.strongbox_keystore_v4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.strongbox_keystore.xml
 
 # Media
diff --git a/configs/permissions/android.hardware.hardware_keystore_v200.xml b/configs/permissions/android.hardware.hardware_keystore_v200.xml
deleted file mode 100644
index 2ebf1fe..0000000
--- a/configs/permissions/android.hardware.hardware_keystore_v200.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<permissions>
-  <feature name="android.hardware.hardware_keystore" version="200" />
-</permissions>
diff --git a/extract-files.py b/extract-files.py
index 54373be..4e75ffa 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -73,7 +73,7 @@ blob_fixups: blob_fixups_user_type = {
         .add_needed('libui_shim.so'),
     'vendor/lib64/libsamsungcamerahal.so': blob_fixup()
         .sig_replace('E0 8A', '94 8B'),
-    'vendor/etc/init/android.hardware.security.keymint-service.rc': blob_fixup()
+    'vendor/etc/init/android.hardware.security.keymint-service-qti.rc': blob_fixup()
         .regex_replace('android.hardware.security.keymint-service', 'android.hardware.security.keymint-service-qti'),
 }  # fmt: skip
 
diff --git a/proprietary-files.txt b/proprietary-files.txt
index afaef4d..53aef16 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -8,7 +8,6 @@
 vendor/bin/adsprpcd
 vendor/bin/loadalgo
 vendor/etc/init/vendor.qti.adsprpc-guestos-service.rc
-vendor/etc/init/vendor.qti.audio-adsprpc-service.rc
 vendor/lib64/libadsp_default_listener.so
 vendor/lib64/libadsprpc.so
 vendor/lib64/libdsphist_qc.so
@@ -786,7 +785,6 @@ vendor/lib64/vendor.qti.gnss-service.so
 vendor/lib64/vendor.samsung.hardware.gnss-V2-ndk_platform.so
 
 # Gatekeeper
-vendor/etc/init/android.hardware.gatekeeper@1.0-service.rc
 vendor/lib64/hw/gatekeeper.mdfpp.so
 
 # Graphics (Adreno firmware)
@@ -874,7 +872,6 @@ vendor/etc/msm_irqbalance.conf
 vendor/bin/init.kernel.post_boot-kalama.sh
 vendor/bin/init.kernel.post_boot.sh
 vendor/bin/init.qcom.class_core.sh
-vendor/bin/init.qcom.post_boot.sh
 vendor/bin/init.qti.kernel.sh
 vendor/bin/system_dlkm_modprobe.sh
 vendor/bin/vendor_modprobe.sh
@@ -890,7 +887,7 @@ vendor/lib64/libspcom.so
 
 # Keymint
 vendor/bin/hw/android.hardware.security.keymint-service:vendor/bin/hw/android.hardware.security.keymint-service-qti;FIX_SONAME
-vendor/etc/init/android.hardware.security.keymint-service.rc
+vendor/etc/init/android.hardware.security.keymint-service.rc:vendor/etc/init/android.hardware.security.keymint-service-qti.rc
 vendor/etc/vintf/manifest/android.hardware.security.keymint-service-qti.xml
 vendor/lib64/libskeymint10device.so
 vendor/lib64/libskeymint_cli.so