Commit 0955b1a3 authored by Kader Bava's avatar Kader Bava
Browse files

RMX1921: Nuke realme odm manifests 



* We added odm manifests in dt for NFC. So we can nuke to avoid conflicts.

Signed-off-by: default avatarkaderbava <ksbava7325@gmail.com>
parent 44f9f9ae

RMX1921-vendor.mk

+0 −2
Original line number Diff line number Diff line
@@ -1422,8 +1422,6 @@ PRODUCT_COPY_FILES += \ 
    vendor/realme/RMX1921/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.1-service-Impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@2.1-service-Impl.so \

    vendor/realme/RMX1921/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@2.1.so \

    vendor/realme/RMX1921/proprietary/vendor/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.0.so \

    vendor/realme/RMX1921/proprietary/vendor/odm/etc/vintf/manifest_nfc_ese.xml:$(TARGET_COPY_OUT_ODM)/odm/etc/vintf/manifest_nfc_ese.xml \

    vendor/realme/RMX1921/proprietary/vendor/odm/etc/vintf/manifest_secure_element_uicc.xml:$(TARGET_COPY_OUT_ODM)/odm/etc/vintf/manifest_secure_element_uicc.xml \

    vendor/realme/RMX1921/proprietary/vendor/radio/qcril_database/qcril.db:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/qcril.db \

    vendor/realme/RMX1921/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/0_initial.sql \

    vendor/realme/RMX1921/proprietary/vendor/radio/qcril_database/upgrade/1_version_intro.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/1_version_intro.sql \

proprietary/vendor/odm/etc/vintf/manifest_nfc_ese.xml

deleted100644 → 0
+0 −102
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* *****************************************************************************

** File: manifest_nfc_ese.xml

** VENDOR_EDIT

** Copyright (C), 2018, Realme Mobile Comm Corp., Ltd

**

** Description:

**       secure_element and nfc hal interface for NFC module

**

** Version: 1.0

** Date created: 14:30:00, 2018/12/19

** Author: longzuming@realme.com

** TAG: RM.CN.NFC.Hardware.1704058

** ******************************* Revision History: ***************************

**         <author>                <date>            <desc>

**        Long Zuming            2018/12/19          create

** *****************************************************************************

*/

-->

<manifest version="1.0" type="device">

    <!--UICC secure element -->

   <hal format="hidl">

        <name>android.hardware.secure_element</name>

        <transport>hwbinder</transport>

        <fqname>@1.0::ISecureElement/SIM1</fqname>

        <fqname>@1.0::ISecureElement/SIM2</fqname>

        <fqname>@1.1::ISecureElement/eSE1</fqname>

    </hal>



    <hal format="hidl">

        <name>vendor.nxp.nxpnfc</name>

        <transport>hwbinder</transport>

        <impl level="generic"></impl>

        <version>1.0</version>

        <interface>

            <name>INxpNfc</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>vendor.nxp.nxpese</name>

        <transport>hwbinder</transport>

        <impl level="generic"></impl>

        <version>1.0</version>

        <interface>

            <name>INxpEse</name>

            <instance>default</instance>

        </interface>

    </hal>

    <!-- #ifndef VENDOR_EDIT -->

    <!-- Weiwei.Deng@CN.NFC.Basic.Hardware, 2018/12/31 -->

    <!-- remove for INxpWiredSe HIDL, not needed -->

    <!--

    <hal format="hidl">

        <name>vendor.nxp.nxpwiredse</name>

        <transport>hwbinder</transport>

        <impl level="generic"></impl>

        <version>1.0</version>

        <interface>

            <name>INxpWiredSe</name>

            <instance>default</instance>

        </interface>

    </hal>

    -->

    <!-- #endif VENDOR_EDIT -->

    <!-- NFC HAL service -->

    <hal format="hidl">

        <name>android.hardware.nfc</name>

        <transport>hwbinder</transport>

        <version>1.2</version>

        <interface>

            <name>INfc</name>

            <instance>default</instance>

        </interface>

    </hal>

    <!-- #ifndef VENDOR_EDIT -->

    <!-- Weiwei.Deng@CN.NFC.Basic.Hardware, 2018/12/31 -->

    <!-- remove for INqNfc HIDL, not needed -->

    <!--

    <hal format="hidl">

        <name>vendor.nxp.hardware.nfc</name>

        <transport>hwbinder</transport>

        <version>1.0</version>

        <interface>

            <name>INqNfc</name>

            <instance>default</instance>

        </interface>

    </hal>

    -->

    <!-- #endif VENDOR_EDIT -->

    <hal format="hidl">

        <name>vendor.nxp.eventprocessor</name>

        <transport>hwbinder</transport>

        <impl level="generic"></impl>

        <version>1.0</version>

        <interface>

            <name>INxpEseEvtProcessor</name>

            <instance>default</instance>

        </interface>

    </hal>

</manifest>

proprietary/vendor/odm/etc/vintf/manifest_secure_element_uicc.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* *****************************************************************************

** File: manifest_secure_element_uicc.xml

** VENDOR_EDIT

** Copyright (C), 2018, Realme Mobile Comm Corp., Ltd

**

** Description:

**       secure_element UICC hal interface for NON-NFC device

**

** Version: 1.0

** Date created: 14:30:00, 2018/12/19

** Author: longzuming@realme.com

** TAG: RM.CN.NFC.Hardware.1704058

** ******************************* Revision History: ***************************

**         <author>                <date>            <desc>

**        Long Zuming            2018/12/19          create

** *****************************************************************************

*/

-->

<manifest version="1.0" type="device">

    <!--UICC secure element -->

   <hal format="hidl">

        <name>android.hardware.secure_element</name>

        <transport>hwbinder</transport>

        <fqname>@1.0::ISecureElement/SIM1</fqname>

        <fqname>@1.0::ISecureElement/SIM2</fqname>

    </hal>

</manifest>