Skip to content

Commit

Permalink
tulip: Automatically add apk/jar/vintf fragments to PRODUCT_PACKAGES
Browse files Browse the repository at this point in the history 
Signed-off-by: GhostMaster69-dev <[email protected]>
  • Loading branch information
@mikeNG @GhostMaster69-dev
mikeNG authored and GhostMaster69-dev committed Sep 15, 2023
1 parent ad235dc commit 982abff
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 36 deletions.
65 changes: 50 additions & 15 deletions Android.bp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,70 +6,70 @@ soong_namespace {
}

cc_prebuilt_library_shared {
name: "libantradio",
name: "libthermalclient",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/system_ext/lib/libantradio.so"],
srcs: ["proprietary/vendor/lib/libthermalclient.so"],
},
android_arm64: {
srcs: ["proprietary/system_ext/lib64/libantradio.so"],
srcs: ["proprietary/vendor/lib64/libthermalclient.so"],
},
},
compile_multilib: "both",
check_elf_files: false,
prefer: true,
system_ext_specific: true,
soc_specific: true,
}

cc_prebuilt_library_shared {
name: "libthermalclient",
name: "libantradio",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/libthermalclient.so"],
srcs: ["proprietary/system_ext/lib/libantradio.so"],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/libthermalclient.so"],
srcs: ["proprietary/system_ext/lib64/libantradio.so"],
},
},
compile_multilib: "both",
check_elf_files: false,
prefer: true,
soc_specific: true,
system_ext_specific: true,
}

android_app_import {
name: "FingerprintExtensionService",
name: "SoterService",
owner: "xiaomi",
apk: "proprietary/vendor/app/FingerprintExtensionService/FingerprintExtensionService.apk",
apk: "proprietary/app/SoterService/SoterService.apk",
certificate: "platform",
dex_preopt: {
enabled: false,
},
soc_specific: true,
}

android_app_import {
name: "SoterService",
name: "CneApp",
owner: "xiaomi",
apk: "proprietary/app/SoterService/SoterService.apk",
apk: "proprietary/vendor/app/CneApp/CneApp.apk",
certificate: "platform",
dex_preopt: {
enabled: false,
},
soc_specific: true,
}

android_app_import {
name: "CneApp",
name: "FingerprintExtensionService",
owner: "xiaomi",
apk: "proprietary/vendor/app/CneApp/CneApp.apk",
apk: "proprietary/vendor/app/FingerprintExtensionService/FingerprintExtensionService.apk",
certificate: "platform",
dex_preopt: {
enabled: false,
Expand Down Expand Up @@ -179,6 +179,41 @@ android_app_import {
system_ext_specific: true,
}

dex_import {
name: "com.fingerprints.extension",
owner: "xiaomi",
jars: ["proprietary/vendor/framework/com.fingerprints.extension.jar"],
soc_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,
}

dex_import {
name: "qti-telephony-common",
owner: "xiaomi",
jars: ["proprietary/system_ext/framework/qti-telephony-common.jar"],
system_ext_specific: true,
}

prebuilt_etc_xml {
name: "[email protected]",
owner: "xiaomi",
Expand Down
35 changes: 14 additions & 21 deletions tulip-vendor.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,25 @@ PRODUCT_COPY_FILES += \
vendor/xiaomi/tulip/proprietary/etc/firmware/goodixfp.b06:$(TARGET_COPY_OUT_SYSTEM)/etc/firmware/goodixfp.b06 \
vendor/xiaomi/tulip/proprietary/etc/firmware/goodixfp.b07:$(TARGET_COPY_OUT_SYSTEM)/etc/firmware/goodixfp.b07 \
vendor/xiaomi/tulip/proprietary/etc/firmware/goodixfp.mdt:$(TARGET_COPY_OUT_SYSTEM)/etc/firmware/goodixfp.mdt \
vendor/xiaomi/tulip/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
vendor/xiaomi/tulip/proprietary/lib/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libFileMux.so \
vendor/xiaomi/tulip/proprietary/lib/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libOmxMux.so \
vendor/xiaomi/tulip/proprietary/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmosal.so \
vendor/xiaomi/tulip/proprietary/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmparser_lite.so \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/fm_helium.so \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libfm-hci.so \
vendor/xiaomi/tulip/proprietary/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmmosal.so \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
vendor/xiaomi/tulip/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
vendor/xiaomi/tulip/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
vendor/xiaomi/tulip/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
vendor/xiaomi/tulip/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
vendor/xiaomi/tulip/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
vendor/xiaomi/tulip/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
vendor/xiaomi/tulip/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
vendor/xiaomi/tulip/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml \
vendor/xiaomi/tulip/proprietary/system_ext/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephonyservice.xml \
vendor/xiaomi/tulip/proprietary/system_ext/framework/com.qti.dpmframework.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.qti.dpmframework.jar \
vendor/xiaomi/tulip/proprietary/system_ext/framework/dpmapi.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/dpmapi.jar \
vendor/xiaomi/tulip/proprietary/system_ext/framework/qcrilhook.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/qcrilhook.jar \
vendor/xiaomi/tulip/proprietary/system_ext/framework/qti-telephony-common.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/qti-telephony-common.jar \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/fm_helium.so \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libfm-hci.so \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/lib-imscamera.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imscamera.so \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvideocodec.so \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvt.so \
Expand All @@ -50,7 +47,6 @@ PRODUCT_COPY_FILES += \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimscamera_jni.so \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimsmedia_jni.so \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
vendor/xiaomi/tulip/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
vendor/xiaomi/tulip/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
vendor/xiaomi/tulip/proprietary/vendor/bin/adpl:$(TARGET_COPY_OUT_VENDOR)/bin/adpl \
Expand Down Expand Up @@ -90,8 +86,8 @@ PRODUCT_COPY_FILES += \
vendor/xiaomi/tulip/proprietary/vendor/bin/rmt_storage:$(TARGET_COPY_OUT_VENDOR)/bin/rmt_storage \
vendor/xiaomi/tulip/proprietary/vendor/bin/sensors.qti:$(TARGET_COPY_OUT_VENDOR)/bin/sensors.qti \
vendor/xiaomi/tulip/proprietary/vendor/bin/slim_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/slim_daemon \
vendor/xiaomi/tulip/proprietary/vendor/bin/thermal-engine:$(TARGET_COPY_OUT_VENDOR)/bin/thermal-engine \
vendor/xiaomi/tulip/proprietary/vendor/bin/tftp_server:$(TARGET_COPY_OUT_VENDOR)/bin/tftp_server \
vendor/xiaomi/tulip/proprietary/vendor/bin/thermal-engine:$(TARGET_COPY_OUT_VENDOR)/bin/thermal-engine \
vendor/xiaomi/tulip/proprietary/vendor/bin/time_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/time_daemon \
vendor/xiaomi/tulip/proprietary/vendor/bin/xtra-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/xtra-daemon \
vendor/xiaomi/tulip/proprietary/vendor/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb \
Expand Down Expand Up @@ -214,7 +210,6 @@ PRODUCT_COPY_FILES += \
vendor/xiaomi/tulip/proprietary/vendor/firmware/fpctzappfingerprint.b07:$(TARGET_COPY_OUT_VENDOR)/firmware/fpctzappfingerprint.b07 \
vendor/xiaomi/tulip/proprietary/vendor/firmware/fpctzappfingerprint.mdt:$(TARGET_COPY_OUT_VENDOR)/firmware/fpctzappfingerprint.mdt \
vendor/xiaomi/tulip/proprietary/vendor/firmware/tas2557_uCDSP.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/tas2557_uCDSP.bin \
vendor/xiaomi/tulip/proprietary/vendor/framework/com.fingerprints.extension.jar:$(TARGET_COPY_OUT_VENDOR)/framework/com.fingerprints.extension.jar \
vendor/xiaomi/tulip/proprietary/vendor/lib/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/eglSubDriverAndroid.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/egl/libEGL_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libEGL_adreno.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libGLESv1_CM_adreno.so \
Expand Down Expand Up @@ -843,7 +838,6 @@ PRODUCT_COPY_FILES += \
vendor/xiaomi/tulip/proprietary/vendor/lib/libvidhance.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvidhance.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/libvidhance_gyro.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvidhance_gyro.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/libvqzip.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvqzip.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/sensors.ssc.so:$(TARGET_COPY_OUT_VENDOR)/lib/sensors.ssc.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/rfsa/adsp/dirac_resource.dar:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/dirac_resource.dar \
vendor/xiaomi/tulip/proprietary/vendor/lib/rfsa/adsp/libFastRPC_AUE_Forward_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libFastRPC_AUE_Forward_skel.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/rfsa/adsp/libFastRPC_UTF_Forward_800h_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libFastRPC_UTF_Forward_800h_skel.so \
Expand All @@ -859,6 +853,7 @@ PRODUCT_COPY_FILES += \
vendor/xiaomi/tulip/proprietary/vendor/lib/rfsa/adsp/libscveBlobDescriptor_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libscveBlobDescriptor_skel.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libscveObjectSegmentation_skel.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/rfsa/adsp/libscveT2T_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libscveT2T_skel.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/sensors.ssc.so:$(TARGET_COPY_OUT_VENDOR)/lib/sensors.ssc.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/soundfx/libasphere.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libasphere.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/soundfx/libqcbassboost.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcbassboost.so \
vendor/xiaomi/tulip/proprietary/vendor/lib/soundfx/libqcreverb.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcreverb.so \
Expand Down Expand Up @@ -1106,18 +1101,11 @@ PRODUCT_COPY_FILES += \
vendor/xiaomi/tulip/proprietary/vendor/lib64/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib64/[email protected] \
vendor/xiaomi/tulip/proprietary/vendor/lib64/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib64/[email protected] \
vendor/xiaomi/tulip/proprietary/vendor/lib64/[email protected]:$(TARGET_COPY_OUT_VENDOR)/lib64/[email protected] \
vendor/xiaomi/tulip/proprietary/vendor/radio/qcril_database/qcril.db:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/qcril.db \
vendor/xiaomi/tulip/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/0_initial.sql \
vendor/xiaomi/tulip/proprietary/vendor/radio/qcril_database/upgrade/1_version_intro.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/1_version_intro.sql \
vendor/xiaomi/tulip/proprietary/vendor/radio/qcril_database/upgrade/2_version_add_wps_config.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/2_version_add_wps_config.sql \
vendor/xiaomi/tulip/proprietary/vendor/radio/qcril_database/upgrade/3_version_update_wps_config.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/3_version_update_wps_config.sql \
vendor/xiaomi/tulip/proprietary/vendor/radio/qcril_database/upgrade/4_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/4_version_update_ecc_table.sql \
vendor/xiaomi/tulip/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/5_version_update_ecc_table.sql \
vendor/xiaomi/tulip/proprietary/vendor/radio/qcril_database/upgrade/8_version_mi.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/8_version_mi.sql
vendor/xiaomi/tulip/proprietary/vendor/radio/qcril_database/qcril.db:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/qcril.db

PRODUCT_PACKAGES += \
libantradio \
libthermalclient \
libantradio \
SoterService \
CneApp \
FingerprintExtensionService \
Expand All @@ -1130,4 +1118,9 @@ PRODUCT_PACKAGES += \
dpmserviceapp \
ims \
qcrilmsgtunnel \
com.fingerprints.extension \
com.qti.dpmframework \
dpmapi \
qcrilhook \
qti-telephony-common \
[email protected]

0 comments on commit 982abff

Please sign in to comment.