From 16cddff7d9c920673ed26c3fb51f2cbe2ff57b8a Mon Sep 17 00:00:00 2001 From: Rebecca Schultz Zavin Date: Wed, 15 Jul 2009 18:35:23 -0700 Subject: [PATCH] Change libcamera to load the vendor camera library by the new name, liboemcamera instead of libqcamera. Signed-off-by: Rebecca Schultz Zavin --- libcamera2/Android.mk | 2 +- libcamera2/QualcommCameraHardware.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libcamera2/Android.mk b/libcamera2/Android.mk index 75df2a1..f00bec6 100644 --- a/libcamera2/Android.mk +++ b/libcamera2/Android.mk @@ -24,7 +24,7 @@ LOCAL_SHARED_LIBRARIES:= libutils libui liblog LOCAL_SHARED_LIBRARIES+= libbinder ifneq ($(DLOPEN_LIBMMCAMERA),1) -LOCAL_SHARED_LIBRARIES+= libqcamera +LOCAL_SHARED_LIBRARIES+= liboemcamera else LOCAL_SHARED_LIBRARIES+= libdl endif diff --git a/libcamera2/QualcommCameraHardware.cpp b/libcamera2/QualcommCameraHardware.cpp index d0820f0..95456a4 100644 --- a/libcamera2/QualcommCameraHardware.cpp +++ b/libcamera2/QualcommCameraHardware.cpp @@ -324,10 +324,10 @@ void QualcommCameraHardware::startCamera() { LOGV("startCamera E"); #if DLOPEN_LIBMMCAMERA - libmmcamera = ::dlopen("libqcamera.so", RTLD_NOW); - LOGV("loading libqcamera at %p", libmmcamera); + libmmcamera = ::dlopen("liboemcamera.so", RTLD_NOW); + LOGV("loading liboemcamera at %p", libmmcamera); if (!libmmcamera) { - LOGE("FATAL ERROR: could not dlopen libqcamera.so: %s", dlerror()); + LOGE("FATAL ERROR: could not dlopen liboemcamera.so: %s", dlerror()); return; } @@ -700,10 +700,10 @@ void QualcommCameraHardware::runFrameThread(void *data) // frame thread, because we do not know when it will exit relative to the // lifetime of this object. We do not want to dlclose() libqcamera while // LINK_cam_frame is still running. - void *libhandle = ::dlopen("libqcamera.so", RTLD_NOW); + void *libhandle = ::dlopen("liboemcamera.so", RTLD_NOW); LOGV("FRAME: loading libqcamera at %p", libhandle); if (!libhandle) { - LOGE("FATAL ERROR: could not dlopen libqcamera.so: %s", dlerror()); + LOGE("FATAL ERROR: could not dlopen liboemcamera.so: %s", dlerror()); } if (libhandle) #endif @@ -1130,10 +1130,10 @@ void QualcommCameraHardware::runAutoFocus() // AF thread, because we do not know when it will exit relative to the // lifetime of this object. We do not want to dlclose() libqcamera while // LINK_cam_frame is still running. - void *libhandle = ::dlopen("libqcamera.so", RTLD_NOW); + void *libhandle = ::dlopen("liboemcamera.so", RTLD_NOW); LOGV("AF: loading libqcamera at %p", libhandle); if (!libhandle) { - LOGE("FATAL ERROR: could not dlopen libqcamera.so: %s", dlerror()); + LOGE("FATAL ERROR: could not dlopen liboemcamera.so: %s", dlerror()); close(mAutoFocusFd); mAutoFocusFd = -1; mAutoFocusThreadRunning = false;