sm8450-common: Remove more nfc related features for non nfc skus

As seen on stock marble vs marblein

Change-Id: If4491113e60908017c33d9eaef102a3922334f7c
This commit is contained in:
Arian 2024-05-22 00:37:56 +02:00
parent 41c5f376cb
commit 2bb1b0c9b8
3 changed files with 59 additions and 9 deletions

View file

@ -307,13 +307,17 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml
# NFC
# NFC / Secure Element
PRODUCT_PACKAGES += \
android.hardware.nfc-service.nxp \
android.hardware.nfc@1.2.vendor \
android.hardware.secure_element@1.2.vendor \
com.android.nfc_extras \
libchrome.vendor
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml
ifeq ($(TARGET_NFC_SUPPORTED_SKUS),)
TARGET_COPY_OUT_NFC_SKU_PERMISSIONS := $(TARGET_COPY_OUT_VENDOR)/etc/permissions/
else
@ -328,6 +332,7 @@ $(foreach sku_out, $(TARGET_COPY_OUT_NFC_SKU_PERMISSIONS), \
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(sku_out)/android.hardware.nfc.hcef.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(sku_out)/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.xml:$(sku_out)/android.hardware.nfc.xml \
frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(sku_out)/etc/permissions/android.hardware.se.omapi.ese.xml \
frameworks/native/data/etc/com.android.nfc_extras.xml:$(sku_out)/com.android.nfc_extras.xml \
frameworks/native/data/etc/com.nxp.mifare.xml:$(sku_out)/com.nxp.mifare.xml))
@ -400,14 +405,6 @@ PRODUCT_PACKAGES += \
android.hardware.radio.config@1.3.vendor \
android.hardware.radio.deprecated@1.0.vendor \
# Secure element
PRODUCT_PACKAGES += \
android.hardware.secure_element@1.2.vendor
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml
# Sensors
PRODUCT_PACKAGES += \
android.hardware.sensors@2.1-service.xiaomi-multihal \

View file

@ -8,8 +8,40 @@
<name>android.hardware.nfc</name>
<fqname>INfc/default</fqname>
</hal>
<!-- secure element -->
<hal format="hidl" override="true">
<name>android.hardware.secure_element</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>ISecureElement</name>
<instance>eSE1</instance>
<instance>SIM1</instance>
<instance>SIM2</instance>
</interface>
</hal>
<hal format="aidl" override="true">
<name>vendor.nxp.nxpnfc_aidl</name>
<fqname>INxpNfc/default</fqname>
</hal>
<!-- eSEPowerManager -->
<hal format="hidl" override="true">
<name>vendor.qti.esepowermanager</name>
<transport>hwbinder</transport>
<version>1.1</version>
<interface>
<name>IEsePowerManager</name>
<instance>default</instance>
</interface>
</hal>
<!-- Eid service -->
<hal format="hidl" override="true">
<name>vendor.qti.hardware.eid</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IEid</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View file

@ -7,7 +7,28 @@
<hal format="aidl" override="true">
<name>android.hardware.nfc</name>
</hal>
<!-- secure element -->
<hal format="hidl" override="true">
<name>android.hardware.secure_element</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>ISecureElement</name>
<instance>SIM1</instance>
<instance>SIM2</instance>
</interface>
</hal>
<hal format="aidl" override="true">
<name>vendor.nxp.nxpnfc_aidl</name>
</hal>
<!-- eSEPowerManager -->
<hal format="hidl" override="true">
<name>vendor.qti.esepowermanager</name>
<transport>hwbinder</transport>
</hal>
<!-- Eid service -->
<hal format="hidl" override="true">
<name>vendor.qti.hardware.eid</name>
<transport>hwbinder</transport>
</hal>
</manifest>