Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c7fd999 authored by Bill Yi's avatar Bill Yi Committed by Android (Google) Code Review
Browse files

Merge "Update redfin vendor blobs" into rvc-d1-dev

parents a9855294 7c8b7e71
Loading
Loading
Loading
Loading
+0 −22
Original line number Diff line number Diff line
@@ -7,13 +7,9 @@
    ;;
  qcom)
    TO_EXTRACT="\
            system/etc/init/qvrd.rc \
            system/etc/qvr/6dof_config.xml \
            system/etc/qvr/qvrservice_config.txt \
            system_ext/etc/permissions/org_codeaurora_ims.xml \
            system_ext/etc/permissions/qcrilhook.xml \
            system_ext/etc/permissions/telephonyservice.xml \
            system_ext/framework/com.qti.snapdragon.sdk.display.jar \
            system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar \
            system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar \
            system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar \
@@ -25,7 +21,6 @@
            system_ext/framework/qti-telephony-utils.jar \
            system_ext/framework/remotesimlockmanagerlibrary.jar \
            system_ext/framework/uimremotesimlocklibrary.jar \
            system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar \
            system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar \
            system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar \
            system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar \
@@ -54,22 +49,5 @@
            system_ext/lib/libvr_object_engine.so \
            system_ext/app/QtiTelephonyService/QtiTelephonyService.apk \
            system_ext/priv-app/ims/ims.apk \
            system/framework/QPerformance.jar \
            system/framework/UxPerformance.jar \
            system/lib64/libOpenCL_system.so \
            system/lib64/libqvrcamera_client.qti.so \
            system/lib64/libqvrservice_client.qti.so \
            system/lib64/libqvrservice_ov7251_hvx_tuning.so \
            system/lib64/libqvrservice_ov9282_hvx_tuning.so \
            system/lib/libeye_tracking_dsp_sample_stub.so \
            system/lib/libOpenCL_system.so \
            system/lib/libqvr_cam_cdsp_driver_stub.so \
            system/lib/libqvrcamera_client.qti.so \
            system/lib/libqvr_cdsp_driver_stub.so \
            system/lib/libqvr_eyetracking_plugin.so \
            system/lib/libqvrservice_client.qti.so \
            system/lib/libqvrservice_ov7251_hvx_tuning.so \
            system/lib/libqvrservice_ov9282_hvx_tuning.so \
            system/lib/libqvrservice.so \
            "
    ;;
+0 −294
Original line number Diff line number Diff line
@@ -15,28 +15,6 @@
soong_namespace {
}

cc_prebuilt_library_shared {
    name: "libeye_tracking_dsp_sample_stub",
    arch: {
        arm: {
            srcs: ["libeye_tracking_dsp_sample_stub.so"],
            shared_libs: [
                // "libcdsprpc_system",
                "liblog",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
    },
    compile_multilib: "32",
    strip: {
        none: true,
    },
    check_elf_files: false,
}

cc_prebuilt_library_shared {
    name: "libhoaeffects_csim",
    arch: {
@@ -264,40 +242,6 @@ cc_prebuilt_library_shared {
    },
}

cc_prebuilt_library_shared {
    name: "libOpenCL_system",
    arch: {
        arm: {
            srcs: ["libOpenCL_system.so"],
            shared_libs: [
                "libcutils",
                "liblog",
                "libvndksupport",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
        arm64: {
            srcs: ["lib64/libOpenCL_system.so"],
            shared_libs: [
                "libcutils",
                "liblog",
                "libvndksupport",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
    },
    compile_multilib: "both",
    strip: {
        none: true,
    },
}

cc_prebuilt_library_shared {
    name: "libqct_resampler",
    arch: {
@@ -319,244 +263,6 @@ cc_prebuilt_library_shared {
    },
}

cc_prebuilt_library_shared {
    name: "libqvr_cam_cdsp_driver_stub",
    arch: {
        arm: {
            srcs: ["libqvr_cam_cdsp_driver_stub.so"],
            shared_libs: [
                // "libcdsprpc_system",
                "liblog",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
    },
    compile_multilib: "32",
    strip: {
        none: true,
    },
    check_elf_files: false,
}

cc_prebuilt_library_shared {
    name: "libqvrcamera_client.qti",
    arch: {
        arm: {
            srcs: ["libqvrcamera_client.qti.so"],
            shared_libs: [
                "liblog",
                "libcutils",
                "libutils",
                "libnativewindow",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
        arm64: {
            srcs: ["lib64/libqvrcamera_client.qti.so"],
            shared_libs: [
                "liblog",
                "libcutils",
                "libutils",
                "libnativewindow",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
    },
    compile_multilib: "both",
    strip: {
        none: true,
    },
}

cc_prebuilt_library_shared {
    name: "libqvr_cdsp_driver_stub",
    arch: {
        arm: {
            srcs: ["libqvr_cdsp_driver_stub.so"],
            shared_libs: [
                // "libcdsprpc_system",
                "liblog",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
    },
    compile_multilib: "32",
    strip: {
        none: true,
    },
    check_elf_files: false,
}

cc_prebuilt_library_shared {
    name: "libqvr_eyetracking_plugin",
    arch: {
        arm: {
            srcs: ["libqvr_eyetracking_plugin.so"],
            shared_libs: [
                "libutils",
                "libcutils",
                "liblog",
                "libnativewindow",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
    },
    compile_multilib: "32",
    strip: {
        none: true,
    },
}

cc_prebuilt_library_shared {
    name: "libqvrservice_client.qti",
    arch: {
        arm: {
            srcs: ["libqvrservice_client.qti.so"],
            shared_libs: [
                "liblog",
                "libcutils",
                "libdrm",
                "libutils",
                "libnativewindow",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
        arm64: {
            srcs: ["lib64/libqvrservice_client.qti.so"],
            shared_libs: [
                "liblog",
                "libcutils",
                "libdrm",
                "libutils",
                "libnativewindow",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
    },
    compile_multilib: "both",
    strip: {
        none: true,
    },
}

cc_prebuilt_library_shared {
    name: "libqvrservice_ov7251_hvx_tuning",
    arch: {
        arm: {
            srcs: ["libqvrservice_ov7251_hvx_tuning.so"],
            shared_libs: [
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
        arm64: {
            srcs: ["lib64/libqvrservice_ov7251_hvx_tuning.so"],
            shared_libs: [
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
    },
    compile_multilib: "both",
    strip: {
        none: true,
    },
}

cc_prebuilt_library_shared {
    name: "libqvrservice_ov9282_hvx_tuning",
    arch: {
        arm: {
            srcs: ["libqvrservice_ov9282_hvx_tuning.so"],
            shared_libs: [
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
        arm64: {
            srcs: ["lib64/libqvrservice_ov9282_hvx_tuning.so"],
            shared_libs: [
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
    },
    compile_multilib: "both",
    strip: {
        none: true,
    },
}

cc_prebuilt_library_shared {
    name: "libqvrservice",
    arch: {
        arm: {
            srcs: ["libqvrservice.so"],
            shared_libs: [
                "liblog",
                "libcutils",
                "libutils",
                "libbinder",
                "libnativewindow",
                "android.hardware.sensors@1.0",
                "android.frameworks.sensorservice@1.0",
                "android.hardware.sensors@2.0",
                "libdrm",
                "libhidlbase",
                // "libhwbinder",
                "libui",
                "libfmq",
                "libhardware",
                "libcamera_metadata",
                "libsync",
                "libqvrcamera_client.qti",
                "android.hardware.camera.provider@2.4",
                "android.hardware.camera.device@3.2",
                "android.hardware.camera.common@1.0",
                "libusbhost",
                "libc++",
                "libc",
                "libm",
                "libdl",
            ],
        },
    },
    compile_multilib: "32",
    strip: {
        none: true,
    },
    check_elf_files: false,
}

cc_prebuilt_library_shared {
    name: "libvr_amb_engine",
    arch: {
+0 −17
Original line number Diff line number Diff line
@@ -21,35 +21,21 @@ PRODUCT_PACKAGES := \
    QtiTelephonyService

PRODUCT_PACKAGES += \
    libeye_tracking_dsp_sample_stub \
    libhoaeffects_csim \
    libimscamera_jni \
    libimsmedia_jni \
    lib-imsvideocodec \
    liblistensoundmodel2.qti \
    libmmosal \
    libOpenCL_system \
    libqct_resampler \
    libqvr_cam_cdsp_driver_stub \
    libqvrcamera_client.qti \
    libqvr_cdsp_driver_stub \
    libqvr_eyetracking_plugin \
    libqvrservice \
    libqvrservice_client.qti \
    libqvrservice_ov7251_hvx_tuning \
    libqvrservice_ov9282_hvx_tuning \
    libvr_amb_engine \
    libvr_object_engine \

#  blob(s) necessary for redfin hardware
PRODUCT_COPY_FILES := \
     vendor/qcom/redfin/proprietary/qvrd.rc:system/etc/init/qvrd.rc \
     vendor/qcom/redfin/proprietary/6dof_config.xml:system/etc/qvr/6dof_config.xml \
     vendor/qcom/redfin/proprietary/qvrservice_config.txt:system/etc/qvr/qvrservice_config.txt \
     vendor/qcom/redfin/proprietary/org_codeaurora_ims.xml:system_ext/etc/permissions/org_codeaurora_ims.xml \
     vendor/qcom/redfin/proprietary/qcrilhook.xml:system_ext/etc/permissions/qcrilhook.xml \
     vendor/qcom/redfin/proprietary/telephonyservice.xml:system_ext/etc/permissions/telephonyservice.xml \
     vendor/qcom/redfin/proprietary/com.qti.snapdragon.sdk.display.jar:system_ext/framework/com.qti.snapdragon.sdk.display.jar \
     vendor/qcom/redfin/proprietary/com.qualcomm.qti.imscmservice-V2.0-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar \
     vendor/qcom/redfin/proprietary/com.qualcomm.qti.imscmservice-V2.1-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar \
     vendor/qcom/redfin/proprietary/com.qualcomm.qti.imscmservice-V2.2-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar \
@@ -61,7 +47,6 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/redfin/proprietary/qti-telephony-utils.jar:system_ext/framework/qti-telephony-utils.jar \
     vendor/qcom/redfin/proprietary/remotesimlockmanagerlibrary.jar:system_ext/framework/remotesimlockmanagerlibrary.jar \
     vendor/qcom/redfin/proprietary/uimremotesimlocklibrary.jar:system_ext/framework/uimremotesimlocklibrary.jar \
     vendor/qcom/redfin/proprietary/vendor.qti.hardware.alarm-V1.0-java.jar:system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar \
     vendor/qcom/redfin/proprietary/vendor.qti.hardware.data.connection-V1.0-java.jar:system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar \
     vendor/qcom/redfin/proprietary/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar:system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar \
     vendor/qcom/redfin/proprietary/vendor.qti.hardware.data.iwlan-V1.0-java.jar:system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar \
@@ -71,5 +56,3 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/redfin/proprietary/vendor.qti.ims.rcsconfig-V1.0-java.jar:system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar \
     vendor/qcom/redfin/proprietary/vendor.qti.latency-V2.0-java.jar:system_ext/framework/vendor.qti.latency-V2.0-java.jar \
     vendor/qcom/redfin/proprietary/vendor.qti.voiceprint-V1.0-java.jar:system_ext/framework/vendor.qti.voiceprint-V1.0-java.jar \
     vendor/qcom/redfin/proprietary/QPerformance.jar:system/framework/QPerformance.jar \
     vendor/qcom/redfin/proprietary/UxPerformance.jar:system/framework/UxPerformance.jar \