diff --git a/Android.bp b/Android.bp index 5b5a4fe..e337bf2 100644 --- a/Android.bp +++ b/Android.bp @@ -315,30 +315,6 @@ android_app_import { product_specific: true, } -android_app_import { - name: "HotwordEnrollmentOKGoogleHEXAGON", - owner: "xiaomi", - apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - -android_app_import { - name: "HotwordEnrollmentXGoogleHEXAGON", - owner: "xiaomi", - apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - android_app_import { name: "dpmserviceapp", owner: "xiaomi", diff --git a/curtana-vendor.mk b/curtana-vendor.mk index 3672c23..86b91ba 100644 --- a/curtana-vendor.mk +++ b/curtana-vendor.mk @@ -152,6 +152,8 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/bin/garden_app:$(TARGET_COPY_OUT_VENDOR)/bin/garden_app \ vendor/xiaomi/curtana/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \ vendor/xiaomi/curtana/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \ + vendor/xiaomi/curtana/proprietary/vendor/bin/hw/android.hardware.camera.provider@2.4-service_64:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.camera.provider@2.4-service_64 \ + vendor/xiaomi/curtana/proprietary/vendor/bin/hw/android.hardware.camera.provider@2.4-service_64.rc:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.camera.provider@2.4-service_64.rc \ vendor/xiaomi/curtana/proprietary/vendor/bin/hw/android.hardware.drm@1.2-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.2-service.widevine \ vendor/xiaomi/curtana/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \ vendor/xiaomi/curtana/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@4.0-service-qti \ @@ -486,6 +488,15 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/firmware/vehicle_dacia_RTP.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/vehicle_dacia_RTP.bin \ vendor/xiaomi/curtana/proprietary/vendor/firmware/vehicle_moto_RTP.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/vehicle_moto_RTP.bin \ vendor/xiaomi/curtana/proprietary/vendor/firmware/vehicle_plane_RTP.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/vehicle_plane_RTP.bin \ + vendor/xiaomi/curtana/proprietary/vendor/lib/android.hardware.camera.provider@2.4-external.so:$(TARGET_COPY_OUT_VENDOR)/lib/android.hardware.camera.provider@2.4-external.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib/android.hardware.camera.provider@2.4-legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib/android.hardware.camera.provider@2.4-legacy.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib/camera.device@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/camera.device@1.0-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib/camera.device@3.2-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/camera.device@3.2-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib/camera.device@3.3-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/camera.device@3.3-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib/camera.device@3.4-external-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/camera.device@3.4-external-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib/camera.device@3.4-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/camera.device@3.4-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib/camera.device@3.5-external-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/camera.device@3.5-external-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib/camera.device@3.5-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/camera.device@3.5-impl.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/eglSubDriverAndroid.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/egl/libEGL_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libEGL_adreno.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libGLESv1_CM_adreno.so \ @@ -493,6 +504,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib/egl/libQTapGLES.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libQTapGLES.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_adreno.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_esx.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib/hw/android.hardware.camera.provider@2.4-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/android.hardware.camera.provider@2.4-impl.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/hw/sound_trigger.primary.atoll.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/sound_trigger.primary.atoll.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/hw/vulkan.atoll.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vulkan.atoll.so \ @@ -647,11 +659,21 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib/rfsa/adsp/misound_res.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/misound_res.bin \ vendor/xiaomi/curtana/proprietary/vendor/lib/rfsa/adsp/tas25xx_TI_0.bin:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/tas25xx_TI_0.bin \ vendor/xiaomi/curtana/proprietary/vendor/lib/soundfx/libasphere.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libasphere.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib/vendor.qti.hardware.camera.device@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.camera.device@1.0.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.1.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.2.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/vendor.qti.hardware.vpp@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.vpp@1.3.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.wifidisplaysession@1.0.so \ vendor/xiaomi/curtana/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-external.so:$(TARGET_COPY_OUT_VENDOR)/lib64/android.hardware.camera.provider@2.4-external.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib64/android.hardware.camera.provider@2.4-legacy.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/camera.device@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera.device@1.0-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/camera.device@3.2-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera.device@3.2-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/camera.device@3.3-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera.device@3.3-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/camera.device@3.4-external-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera.device@3.4-external-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/camera.device@3.4-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera.device@3.4-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/camera.device@3.5-external-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera.device@3.5-external-impl.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/camera.device@3.5-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera.device@3.5-impl.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/camera/com.qti.eeprom.sunny_gc8034.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.sunny_gc8034.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/camera/com.qti.sensor.curtana_gc02m1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.curtana_gc02m1.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/camera/com.qti.sensor.curtana_gc8034.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensor.curtana_gc8034.so \ @@ -794,6 +816,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib64/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_adreno.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_esx.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/hw/android.hardware.camera.provider@2.4-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.camera.provider@2.4-impl.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/hw/camera.qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/camera.qcom.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/hw/com.qti.chi.override.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.qti.chi.override.so \ @@ -1105,6 +1128,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/curtana/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.alarm@1.0.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.cacert@1.0.so \ + vendor/xiaomi/curtana/proprietary/vendor/lib64/vendor.qti.hardware.camera.device@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.camera.device@1.0.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so \ vendor/xiaomi/curtana/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so \ @@ -1184,8 +1208,6 @@ PRODUCT_PACKAGES += \ embms \ imssettings \ uceShimService \ - HotwordEnrollmentOKGoogleHEXAGON \ - HotwordEnrollmentXGoogleHEXAGON \ dpmserviceapp \ ims \ qcrilmsgtunnel \ diff --git a/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk b/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk deleted file mode 100644 index fec5535..0000000 Binary files a/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk and /dev/null differ diff --git a/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk b/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk deleted file mode 100644 index ba85072..0000000 Binary files a/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk and /dev/null differ diff --git a/proprietary/vendor/bin/hw/android.hardware.camera.provider@2.4-service_64 b/proprietary/vendor/bin/hw/android.hardware.camera.provider@2.4-service_64 new file mode 100644 index 0000000..eb704d8 Binary files /dev/null and b/proprietary/vendor/bin/hw/android.hardware.camera.provider@2.4-service_64 differ diff --git a/proprietary/vendor/lib/android.hardware.camera.provider@2.4-external.so b/proprietary/vendor/lib/android.hardware.camera.provider@2.4-external.so new file mode 100644 index 0000000..52fdebd Binary files /dev/null and b/proprietary/vendor/lib/android.hardware.camera.provider@2.4-external.so differ diff --git a/proprietary/vendor/lib/android.hardware.camera.provider@2.4-legacy.so b/proprietary/vendor/lib/android.hardware.camera.provider@2.4-legacy.so new file mode 100644 index 0000000..94fa076 Binary files /dev/null and b/proprietary/vendor/lib/android.hardware.camera.provider@2.4-legacy.so differ diff --git a/proprietary/vendor/lib/camera.device@1.0-impl.so b/proprietary/vendor/lib/camera.device@1.0-impl.so new file mode 100644 index 0000000..08eecc9 Binary files /dev/null and b/proprietary/vendor/lib/camera.device@1.0-impl.so differ diff --git a/proprietary/vendor/lib/camera.device@3.2-impl.so b/proprietary/vendor/lib/camera.device@3.2-impl.so new file mode 100644 index 0000000..aed94a5 Binary files /dev/null and b/proprietary/vendor/lib/camera.device@3.2-impl.so differ diff --git a/proprietary/vendor/lib/camera.device@3.3-impl.so b/proprietary/vendor/lib/camera.device@3.3-impl.so new file mode 100644 index 0000000..578fc1e Binary files /dev/null and b/proprietary/vendor/lib/camera.device@3.3-impl.so differ diff --git a/proprietary/vendor/lib/camera.device@3.4-external-impl.so b/proprietary/vendor/lib/camera.device@3.4-external-impl.so new file mode 100644 index 0000000..803ae75 Binary files /dev/null and b/proprietary/vendor/lib/camera.device@3.4-external-impl.so differ diff --git a/proprietary/vendor/lib/camera.device@3.4-impl.so b/proprietary/vendor/lib/camera.device@3.4-impl.so new file mode 100644 index 0000000..af14c98 Binary files /dev/null and b/proprietary/vendor/lib/camera.device@3.4-impl.so differ diff --git a/proprietary/vendor/lib/camera.device@3.5-external-impl.so b/proprietary/vendor/lib/camera.device@3.5-external-impl.so new file mode 100644 index 0000000..b3f1275 Binary files /dev/null and b/proprietary/vendor/lib/camera.device@3.5-external-impl.so differ diff --git a/proprietary/vendor/lib/camera.device@3.5-impl.so b/proprietary/vendor/lib/camera.device@3.5-impl.so new file mode 100644 index 0000000..813ef09 Binary files /dev/null and b/proprietary/vendor/lib/camera.device@3.5-impl.so differ diff --git a/proprietary/vendor/lib/hw/android.hardware.camera.provider@2.4-impl.so b/proprietary/vendor/lib/hw/android.hardware.camera.provider@2.4-impl.so new file mode 100644 index 0000000..ce1972e Binary files /dev/null and b/proprietary/vendor/lib/hw/android.hardware.camera.provider@2.4-impl.so differ diff --git a/proprietary/vendor/lib/vendor.qti.hardware.camera.device@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.camera.device@1.0.so new file mode 100644 index 0000000..b73a079 Binary files /dev/null and b/proprietary/vendor/lib/vendor.qti.hardware.camera.device@1.0.so differ diff --git a/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-external.so b/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-external.so new file mode 100644 index 0000000..181a6e4 Binary files /dev/null and b/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-external.so differ diff --git a/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-legacy.so b/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-legacy.so new file mode 100644 index 0000000..e0494c0 Binary files /dev/null and b/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-legacy.so differ diff --git a/proprietary/vendor/lib64/camera.device@1.0-impl.so b/proprietary/vendor/lib64/camera.device@1.0-impl.so new file mode 100644 index 0000000..1f1c872 Binary files /dev/null and b/proprietary/vendor/lib64/camera.device@1.0-impl.so differ diff --git a/proprietary/vendor/lib64/camera.device@3.2-impl.so b/proprietary/vendor/lib64/camera.device@3.2-impl.so new file mode 100644 index 0000000..931dd64 Binary files /dev/null and b/proprietary/vendor/lib64/camera.device@3.2-impl.so differ diff --git a/proprietary/vendor/lib64/camera.device@3.3-impl.so b/proprietary/vendor/lib64/camera.device@3.3-impl.so new file mode 100644 index 0000000..2d387e2 Binary files /dev/null and b/proprietary/vendor/lib64/camera.device@3.3-impl.so differ diff --git a/proprietary/vendor/lib64/camera.device@3.4-external-impl.so b/proprietary/vendor/lib64/camera.device@3.4-external-impl.so new file mode 100644 index 0000000..e0a92a3 Binary files /dev/null and b/proprietary/vendor/lib64/camera.device@3.4-external-impl.so differ diff --git a/proprietary/vendor/lib64/camera.device@3.4-impl.so b/proprietary/vendor/lib64/camera.device@3.4-impl.so new file mode 100644 index 0000000..6a7d1bc Binary files /dev/null and b/proprietary/vendor/lib64/camera.device@3.4-impl.so differ diff --git a/proprietary/vendor/lib64/camera.device@3.5-external-impl.so b/proprietary/vendor/lib64/camera.device@3.5-external-impl.so new file mode 100644 index 0000000..b946a66 Binary files /dev/null and b/proprietary/vendor/lib64/camera.device@3.5-external-impl.so differ diff --git a/proprietary/vendor/lib64/camera.device@3.5-impl.so b/proprietary/vendor/lib64/camera.device@3.5-impl.so new file mode 100644 index 0000000..e12d1ed Binary files /dev/null and b/proprietary/vendor/lib64/camera.device@3.5-impl.so differ diff --git a/proprietary/vendor/lib64/hw/android.hardware.camera.provider@2.4-impl.so b/proprietary/vendor/lib64/hw/android.hardware.camera.provider@2.4-impl.so new file mode 100644 index 0000000..679a857 Binary files /dev/null and b/proprietary/vendor/lib64/hw/android.hardware.camera.provider@2.4-impl.so differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.camera.device@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.camera.device@1.0.so new file mode 100644 index 0000000..6eaad2e Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.hardware.camera.device@1.0.so differ