From 19850112b08e033fb358078dcd53d13c8140df44 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Mon, 2 May 2022 14:06:56 +0100 Subject: [PATCH] sm6225-common: Switch to source-built mlipay interface & move mlipay blobs to vendor Change-Id: I7daaaffd9fe7a870e42c1d882b52dc93b3231120 --- common.mk | 5 +++++ proprietary-files-phone.txt | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/common.mk b/common.mk index e058084..24b6dd6 100644 --- a/common.mk +++ b/common.mk @@ -376,6 +376,11 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ vendor.qti.hardware.memtrack-service +# Mlipay +PRODUCT_PACKAGES += \ + vendor.xiaomi.hardware.mlipay@1.1.vendor \ + vendor.xiaomi.hardware.mtdservice@1.0.vendor + # NDK PRODUCT_PACKAGES += \ android.hardware.common-V2-ndk.vendor \ diff --git a/proprietary-files-phone.txt b/proprietary-files-phone.txt index ef83851..6e33971 100644 --- a/proprietary-files-phone.txt +++ b/proprietary-files-phone.txt @@ -153,16 +153,14 @@ vendor/etc/vintf/manifest/android.hardware.ir-service.example.xml vendor/lib64/hw/consumerir.qcom.so # Mlipay -odm/bin/mlipayd@1.1 -odm/etc/init/vendor.xiaomi.hardware.mlipay@1.1-service.rc -odm/etc/vintf/manifest/manifest_vendor.xiaomi.hardware.mlipay.xml -odm/lib64/libmlipay.so -odm/lib64/libmlipay@1.1.so -odm/lib64/libteeclientjni.so -odm/lib64/libwvkeybox.so -odm/lib64/vendor.xiaomi.hardware.mlipay@1.0.so -odm/lib64/vendor.xiaomi.hardware.mlipay@1.1.so -odm/lib64/vendor.xiaomi.hardware.mtdservice@1.0.so +odm/bin/mlipayd@1.1:vendor/bin/mlipayd@1.1 +odm/etc/init/vendor.xiaomi.hardware.mlipay@1.1-service.rc:vendor/etc/init/vendor.xiaomi.hardware.mlipay@1.1-service.rc +odm/etc/vintf/manifest/manifest_vendor.xiaomi.hardware.mlipay.xml:vendor/etc/vintf/manifest/manifest_vendor.xiaomi.hardware.mlipay.xml +odm/lib64/libmlipay.so:vendor/lib64/libmlipay.so +odm/lib64/libmlipay@1.1.so:vendor/lib64/libmlipay@1.1.so +odm/lib64/libteeclientjni.so:vendor/lib64/libteeclientjni.so +odm/lib64/libwvkeybox.so:vendor/lib64/libwvkeybox.so +odm/lib64/vendor.xiaomi.hardware.mlipay@1.0.so:vendor/lib64/vendor.xiaomi.hardware.mlipay@1.0.so # Radio etc/permissions/privapp-permissions-qti.xml