diff --git a/Android.bp b/Android.bp index 41b2f92..0ad96d3 100644 --- a/Android.bp +++ b/Android.bp @@ -5,6 +5,7 @@ soong_namespace { imports: [ "hardware/motorola", + "hardware/qcom-caf/wlan", "vendor/motorola/sm6225-common", "vendor/qcom/opensource/display", ], @@ -3435,6 +3436,39 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_binary { + name: "cnss-daemon", + owner: "motorola", + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/bin/cnss-daemon", + ], + shared_libs: [ + "libcutils", + "liblog", + "libqmi_cci", + "libqmi_common_so", + "libnl", + "libcld80211", + "libperipheral_client", + "libmdmdetect", + "libqmiservices", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + strip: { + none: true, + }, + prefer: true, + soc_specific: true, +} + cc_prebuilt_binary { name: "android.hardware.biometrics.fingerprint@2.1-goodixservice", owner: "motorola", diff --git a/guam-vendor.mk b/guam-vendor.mk index b2cc660..4e73cb9 100644 --- a/guam-vendor.mk +++ b/guam-vendor.mk @@ -84,6 +84,7 @@ PRODUCT_COPY_FILES += \ vendor/motorola/guam/proprietary/vendor/etc/sensors/sns_reg_config:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sns_reg_config \ vendor/motorola/guam/proprietary/vendor/etc/thermal-engine-guam.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-guam.conf \ vendor/motorola/guam/proprietary/vendor/etc/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \ + vendor/motorola/guam/proprietary/vendor/etc/vhw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vhw.xml \ vendor/motorola/guam/proprietary/vendor/firmware/ICNL9911.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/ICNL9911.bin \ vendor/motorola/guam/proprietary/vendor/firmware/ILITEK_FW_HLT.hex:$(TARGET_COPY_OUT_VENDOR)/firmware/ILITEK_FW_HLT.hex \ vendor/motorola/guam/proprietary/vendor/firmware/ILITEK_FW_TM.hex:$(TARGET_COPY_OUT_VENDOR)/firmware/ILITEK_FW_TM.hex \ @@ -223,6 +224,7 @@ PRODUCT_PACKAGES += \ libtfestriping \ libvidhance \ vendor.goodix.hardware.biometrics.fingerprint@3.0 \ + cnss-daemon \ android.hardware.biometrics.fingerprint@2.1-goodixservice \ android.hardware.biometrics.fingerprint@2.1-service-fpc \ goodix_ident \ diff --git a/proprietary/vendor/bin/cnss-daemon b/proprietary/vendor/bin/cnss-daemon new file mode 100755 index 0000000..9b9d4d4 Binary files /dev/null and b/proprietary/vendor/bin/cnss-daemon differ diff --git a/proprietary/vendor/etc/vhw.xml b/proprietary/vendor/etc/vhw.xml new file mode 100644 index 0000000..a2dd2df --- /dev/null +++ b/proprietary/vendor/etc/vhw.xml @@ -0,0 +1,919 @@ + + + + + + + + + + + + + radio + + ram + + storage + + dualsim + + imager + + frontcolor + + fps + + nfc + + ecompass + + dtv + + + + + + + + .range + + .cmdline + + .chosen + + .system + + + + .auto + + + + + + + key=hwid;index=2;map=1:LATAM,2:EMEA,3:ROW + androidboot. + ro.vendor.hw. + + LATAM + EMEA + ROW + + + + key=hwprobe;index=__ram + ro.vendor.hw. + + 3GB + 4GB + + + + key=hwprobe;index=__storage + ro.vendor.hw. + + 32GB + 64GB + + + default=true + androidboot. + ro.vendor.hw. + + true + false + + + default=48MP + mmi, + ro.vendor.hw. + + 48MP + + + + ro.vendor.hw. + + misty + twilight + other + + + default=true + mmi, + ro.vendor.hw. + + true + + + default=false + mmi, + ro.vendor.hw. + + false + + + default=false + mmi, + ro.vendor.hw. + + false + + + default=false + mmi, + ro.vendor.hw. + + false + + + + + + + + + + + + + + + true + + + false + false + + + true + false + + + + + + + + + + + + radio + + ram + + storage + + dualsim + + imager + + frontcolor + + fps + + nfc + + ecompass + + dtv + + sku_variant + + + + + + + + .range + + .cmdline + + .chosen + + .system + + + + .auto + + + + + + + key=hwid;index=2;map=1:LATAM,2:EMEA,3:ROW,4:LENOVO,5:APEM,6:ROW + androidboot. + ro.vendor.hw. + + LATAM + EMEA + ROW + LENOVO + APEM + + + + key=hwprobe;index=__ram + ro.vendor.hw. + + 2GB + 3GB + 4GB + + + + key=hwprobe;index=__storage + ro.vendor.hw. + + 32GB + 64GB + 128GB + + + default=true + androidboot. + ro.vendor.hw. + + true + false + + + default=48MP + mmi, + ro.vendor.hw. + + 48MP + + + + ro.vendor.hw. + + blue + green + pink + other + + + default=true + mmi, + ro.vendor.hw. + + true + + + key=hwid;index=2;map=1:false,2:false,3:false,4:false,5:false,6:true + mmi, + ro.vendor.hw. + + true + false + + + key=hwid;index=2;map=1:false,2:false,3:true,4:false,5:false,6:true + mmi, + ro.vendor.hw. + + true + false + + + default=false + mmi, + ro.vendor.hw. + + false + + + androidboot. + + nc + n + + + + + + + + + + + + + + true + true + + + true + + + + + + + + + true + false + false + false + + + true + false + true + false + + + true + true + false + false + + + true + true + true + false + + + + true + false + false + true + + + true + false + true + true + + + true + true + false + true + + + true + true + true + true + + + + false + false + false + + + false + true + false + + + true + false + false + + + true + true + false + + + + false + false + true + + + false + true + true + + + true + false + true + + + true + true + true + + + + + + + + + + + + radio + + ram + + storage + + dualsim + + imager + + frontcolor + + fps + + nfc + + ecompass + + dtv + + + + + + + + .range + + .cmdline + + .chosen + + .system + + + + .auto + + + + + + + key=hwid;index=2;map=1:GWL,2:GWLC,3:ATTCA + androidboot. + ro.vendor.hw. + + GWL + GWLC + ATTCA + + + + key=hwprobe;index=__ram + ro.vendor.hw. + + 2GB + 3GB + 4GB + + + + key=hwprobe;index=__storage + ro.vendor.hw. + + 32GB + 64GB + 128GB + + + default=false + androidboot. + ro.vendor.hw. + + true + false + + + default=13MP + mmi, + ro.vendor.hw. + + 13MP + + + + ro.vendor.hw. + + gray + white + other + + + default=true + mmi, + ro.vendor.hw. + + true + + + default=true + mmi, + ro.vendor.hw. + + true + + + default=false + mmi, + ro.vendor.hw. + + false + + + default=false + mmi, + ro.vendor.hw. + + false + + + + + + + + + + + + + + + true + + + false + false + + + true + false + + + + + + + + + + + + radio + + ram + + storage + + dualsim + + imager + + frontcolor + + fps + + nfc + + ecompass + + dtv + + + + + + + + .range + + .cmdline + + .chosen + + .system + + + + .auto + + + + + + + key=hwid;index=2;map=1:NA + androidboot. + ro.vendor.hw. + + NA + + + + key=hwprobe;index=__ram + ro.vendor.hw. + + 3GB + 4GB + + + + key=hwprobe;index=__storage + ro.vendor.hw. + + 32GB + 64GB + + + default=false + androidboot. + ro.vendor.hw. + + false + + + default=48MP + mmi, + ro.vendor.hw. + + 48MP + + + + ro.vendor.hw. + + gray + white + other + + + default=true + mmi, + ro.vendor.hw. + + true + + + default=true + mmi, + ro.vendor.hw. + + true + + + default=false + mmi, + ro.vendor.hw. + + false + + + default=false + mmi, + ro.vendor.hw. + + false + + + + + + + + + + + + + + + true + + + false + false + + + + + + + + + + + + radio + + ram + + storage + + dualsim + + imager + + frontcolor + + fps + + nfc + + ecompass + + dtv + + sku_variant + + + + + + + + .range + + .cmdline + + .chosen + + .system + + + + .auto + + + + + + + key=hwid;index=2;map=1:SUPERCA,2:LATAMCA,3:SUPERCAFIR,4:LATAMCAFIR + androidboot. + ro.vendor.hw. + + SUPERCA + LATAMCA + SUPERCAFIR + LATAMCAFIR + + + + key=hwprobe;index=__ram + ro.vendor.hw. + + 4GB + + + + key=hwprobe;index=__storage + ro.vendor.hw. + + 64GB + 128GB + + + default=true + androidboot. + ro.vendor.hw. + + true + false + + + default=64MP + mmi, + ro.vendor.hw. + + 64MP + + + + ro.vendor.hw. + + gray + white + other + + + default=true + mmi, + ro.vendor.hw. + + true + + + default=false + mmi, + ro.vendor.hw. + + false + + + key=hwid;index=2;map=1:true,2:false,3:true,4:false + mmi, + ro.vendor.hw. + + true + false + + + default=false + mmi, + ro.vendor.hw. + + false + + + androidboot. + + nc + n + + + + + + + + + + + + + + true + true + + + true + + + + + + + + + + + + true + + + false + false + + + true + false + + + true + true + + + false + true + + + + + + +