From 57083020651bddf0b594822536036a252921f6de Mon Sep 17 00:00:00 2001 From: jhenrique09 Date: Thu, 28 Dec 2017 16:16:35 -0200 Subject: [PATCH] sanders: Update camera shim 03-13 07:33:48.860 1512 1512 E HAL : load: module=/system/lib/hw/camera.msm8953.so 03-13 07:33:48.860 1512 1512 E HAL : dlopen failed: cannot locate symbol "_Z35eglQueryStringImplementationANDROIDPvi" referenced by "/system/vendor/lib/libguy.so"... --- libshims/Android.mk | 3 ++- libshims/{DisplayEventReceiver.c => camera_hal.cpp} | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) rename libshims/{DisplayEventReceiver.c => camera_hal.cpp} (66%) diff --git a/libshims/Android.mk b/libshims/Android.mk index 53e0911..79c49bf 100644 --- a/libshims/Android.mk +++ b/libshims/Android.mk @@ -40,9 +40,10 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := DisplayEventReceiver.c +LOCAL_SRC_FILES := camera_hal.cpp LOCAL_MODULE := libshim_camera_hal LOCAL_MODULE_TAGS := optional +LOCAL_SHARED_LIBRARIES := libgui include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) diff --git a/libshims/DisplayEventReceiver.c b/libshims/camera_hal.cpp similarity index 66% rename from libshims/DisplayEventReceiver.c rename to libshims/camera_hal.cpp index 3fce3b5..15339cb 100644 --- a/libshims/DisplayEventReceiver.c +++ b/libshims/camera_hal.cpp @@ -14,6 +14,15 @@ * limitations under the License. */ +#include +#include + /* TODO: Actually provide implementations for these function! */ -void _ZN7android20DisplayEventReceiverC1Ev() {} +extern "C" void _ZN7android20DisplayEventReceiverC1Ev() {} + +EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name); + +extern "C" void _Z35eglQueryStringImplementationANDROIDPvi(EGLDisplay dpy, EGLint name){ + eglQueryStringImplementationANDROID(dpy, name); +}