From 32052fb25c262aaf1a7ed06ab21c09d30ac67578 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Tue, 25 Jan 2022 20:59:12 +0100 Subject: [PATCH] sm8250-common: Regenerate makefiles Change-Id: I3a13e0eb6d1d923e2a15d64d4a38bb12400c66cb --- Android.bp | 48 +++++++++++++++++++++++++++++++++++++++++ sm8250-common-vendor.mk | 14 ++++++------ 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/Android.bp b/Android.bp index 76a0020..376c1fe 100644 --- a/Android.bp +++ b/Android.bp @@ -206,6 +206,54 @@ dex_import { jars: ["proprietary/system/framework/qcnvitems.jar"], } +dex_import { + name: "tcmclient", + owner: "oneplus", + jars: ["proprietary/system/framework/tcmclient.jar"], +} + +dex_import { + name: "com.android.hotwordenrollment.common.util", + owner: "oneplus", + jars: ["proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar"], + system_ext_specific: true, +} + +dex_import { + name: "com.nxp.nfc.nq", + owner: "oneplus", + jars: ["proprietary/system_ext/framework/com.nxp.nfc.nq.jar"], + system_ext_specific: true, +} + +dex_import { + name: "com.qti.dpmframework", + owner: "oneplus", + jars: ["proprietary/system_ext/framework/com.qti.dpmframework.jar"], + system_ext_specific: true, +} + +dex_import { + name: "dpmapi", + owner: "oneplus", + jars: ["proprietary/system_ext/framework/dpmapi.jar"], + system_ext_specific: true, +} + +dex_import { + name: "qcrilhook", + owner: "oneplus", + jars: ["proprietary/system_ext/framework/qcrilhook.jar"], + system_ext_specific: true, +} + +dex_import { + name: "vendor.qti.hardware.alarm-V1.0-java", + owner: "oneplus", + jars: ["proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar"], + system_ext_specific: true, +} + prebuilt_etc_xml { name: "android.hardware.gnss@2.1-service-qti", owner: "oneplus", diff --git a/sm8250-common-vendor.mk b/sm8250-common-vendor.mk index 8c07b9d..cdedf64 100644 --- a/sm8250-common-vendor.mk +++ b/sm8250-common-vendor.mk @@ -9,7 +9,6 @@ PRODUCT_COPY_FILES += \ vendor/oneplus/sm8250-common/proprietary/system/etc/nfcee_access.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/nfcee_access.xml \ vendor/oneplus/sm8250-common/proprietary/system/etc/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \ vendor/oneplus/sm8250-common/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \ - vendor/oneplus/sm8250-common/proprietary/system/framework/tcmclient.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/tcmclient.jar \ vendor/oneplus/sm8250-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \ vendor/oneplus/sm8250-common/proprietary/system_ext/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/wfdservice \ vendor/oneplus/sm8250-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \ @@ -25,12 +24,6 @@ PRODUCT_COPY_FILES += \ vendor/oneplus/sm8250-common/proprietary/system_ext/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephonyservice.xml \ vendor/oneplus/sm8250-common/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \ vendor/oneplus/sm8250-common/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \ - vendor/oneplus/sm8250-common/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.android.hotwordenrollment.common.util.jar \ - vendor/oneplus/sm8250-common/proprietary/system_ext/framework/com.nxp.nfc.nq.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.nxp.nfc.nq.jar \ - vendor/oneplus/sm8250-common/proprietary/system_ext/framework/com.qti.dpmframework.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.qti.dpmframework.jar \ - vendor/oneplus/sm8250-common/proprietary/system_ext/framework/dpmapi.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/dpmapi.jar \ - vendor/oneplus/sm8250-common/proprietary/system_ext/framework/qcrilhook.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/qcrilhook.jar \ - vendor/oneplus/sm8250-common/proprietary/system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.hardware.alarm-V1.0-java.jar \ vendor/oneplus/sm8250-common/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.ant@1.0.so \ vendor/oneplus/sm8250-common/proprietary/system_ext/lib/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.dpm.api@1.0.so \ vendor/oneplus/sm8250-common/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \ @@ -1157,6 +1150,13 @@ PRODUCT_PACKAGES += \ qcrilmsgtunnel \ WfdCommon \ qcnvitems \ + tcmclient \ + com.android.hotwordenrollment.common.util \ + com.nxp.nfc.nq \ + com.qti.dpmframework \ + dpmapi \ + qcrilhook \ + vendor.qti.hardware.alarm-V1.0-java \ android.hardware.gnss@2.1-service-qti \ android.hardware.neuralnetworks@1.3-service-qti-hta \ android.hardware.neuralnetworks@1.3-service-qti \