From cd67a18592dd8d5fd1d6d048d2d2cbd01c3f369d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 4 Mar 2023 21:13:18 +0200 Subject: [PATCH] sdm660-common: Automatically add apk/jar/vintf fragments to PRODUCT_PACKAGES Change-Id: I7f976b9a4a7afc2c5f901bc0630be6523524d61c --- Android.bp | 28 ++++++++++++++++++++++++++++ sdm660-common-vendor.mk | 8 ++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Android.bp b/Android.bp index 3d8f52b..c265740 100644 --- a/Android.bp +++ b/Android.bp @@ -159,6 +159,34 @@ android_app_import { system_ext_specific: true, } +dex_import { + name: "QtiTelephonyServicelibrary", + owner: "xiaomi", + jars: ["proprietary/system_ext/framework/QtiTelephonyServicelibrary.jar"], + system_ext_specific: true, +} + +dex_import { + name: "com.qti.dpmframework", + owner: "xiaomi", + jars: ["proprietary/system_ext/framework/com.qti.dpmframework.jar"], + system_ext_specific: true, +} + +dex_import { + name: "dpmapi", + owner: "xiaomi", + jars: ["proprietary/system_ext/framework/dpmapi.jar"], + system_ext_specific: true, +} + +dex_import { + name: "qcrilhook", + owner: "xiaomi", + jars: ["proprietary/system_ext/framework/qcrilhook.jar"], + system_ext_specific: true, +} + prebuilt_etc_xml { name: "vendor.qti.gnss@3.0-service", owner: "xiaomi", diff --git a/sdm660-common-vendor.mk b/sdm660-common-vendor.mk index a2e8e4f..2dc3a58 100644 --- a/sdm660-common-vendor.mk +++ b/sdm660-common-vendor.mk @@ -22,10 +22,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \ vendor/xiaomi/sdm660-common/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \ vendor/xiaomi/sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephonyservice.xml \ - vendor/xiaomi/sdm660-common/proprietary/system_ext/framework/QtiTelephonyServicelibrary.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/QtiTelephonyServicelibrary.jar \ - vendor/xiaomi/sdm660-common/proprietary/system_ext/framework/com.qti.dpmframework.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.qti.dpmframework.jar \ - vendor/xiaomi/sdm660-common/proprietary/system_ext/framework/dpmapi.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/dpmapi.jar \ - vendor/xiaomi/sdm660-common/proprietary/system_ext/framework/qcrilhook.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/qcrilhook.jar \ vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.ant@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/lib-imscamera.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imscamera.so \ @@ -487,6 +483,10 @@ PRODUCT_PACKAGES += \ dpmserviceapp \ ims \ qcrilmsgtunnel \ + QtiTelephonyServicelibrary \ + com.qti.dpmframework \ + dpmapi \ + qcrilhook \ vendor.qti.gnss@3.0-service ifeq ($(BOARD_HAVE_QCOM_FM),true)