From 4482c4464ecd94cbc0420fd489a5e4c43e1fec74 Mon Sep 17 00:00:00 2001 From: Erfan Abdi Date: Wed, 2 Oct 2019 15:50:00 +0100 Subject: [PATCH] Sanders: Make shim for libcamera.msm8953.so P: GraphicBuffer::lock(uint32_t inUsage, void** vaddr); Q: GraphicBuffer::lock(uint32_t inUsage, void** vaddr, int32_t* outBytesPerPixel, int32_t* outBytesPerStride); Error: cannot locate symbol "_ZN7android13GraphicBuffer4lockEjPPv" referenced by "/vendor/lib/hw/camera.msm8953.so" Change-Id: I1c1fe66f3f73149ced601eae87b970ce392d50ee Signed-off-by: Harsh Shandilya Signed-off-by: Akhil Narang Signed-off-by: ronaxdevil --- device.mk | 1 + libshims/Android.mk | 8 ++++++++ libshims/camera_msm8953_shim.cpp | 9 +++++++++ 3 files changed, 18 insertions(+) create mode 100644 libshims/camera_msm8953_shim.cpp diff --git a/device.mk b/device.mk index 8c29c6c..abb233a 100644 --- a/device.mk +++ b/device.mk @@ -109,6 +109,7 @@ PRODUCT_PACKAGES += \ Snap2 \ Camera2 \ libgui_vendor \ + camera_msm8953_shim \ camera.device@1.0-impl \ camera.device@3.2-impl \ android.hardware.camera.provider@2.4-impl \ diff --git a/libshims/Android.mk b/libshims/Android.mk index c7968a4..17240f1 100644 --- a/libshims/Android.mk +++ b/libshims/Android.mk @@ -22,3 +22,11 @@ LOCAL_MODULE := libqsap_shim LOCAL_MODULE_TAGS := optional LOCAL_PROPRIETARY_MODULE := true include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := camera_msm8953_shim.cpp +LOCAL_SHARED_LIBRARIES := libui libutils +LOCAL_MODULE := camera_msm8953_shim +LOCAL_MODULE_TAGS := optional +LOCAL_PROPRIETARY_MODULE := true +include $(BUILD_SHARED_LIBRARY) diff --git a/libshims/camera_msm8953_shim.cpp b/libshims/camera_msm8953_shim.cpp new file mode 100644 index 0000000..c18e5a4 --- /dev/null +++ b/libshims/camera_msm8953_shim.cpp @@ -0,0 +1,9 @@ +#include + +namespace android { + extern "C" void _ZN7android13GraphicBuffer4lockEjPPvPiS3_(uint32_t inUsage, void** vaddr, int32_t* outBytesPerPixel, int32_t* outBytesPerStride); + + extern "C" void _ZN7android13GraphicBuffer4lockEjPPv(uint32_t inUsage, void** vaddr) { + _ZN7android13GraphicBuffer4lockEjPPvPiS3_(inUsage, vaddr, nullptr, nullptr); + } +}