android/android_hardware_qcom_display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge change 7577

Browse Source 
* changes:
  Change libcamera to load the vendor camera library by the new name, liboemcamera instead of libqcamera.
This commit is contained in:
Android (Google) Code Review 2009-07-16 14:20:24 -07:00
commit f80f80896b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcamera2/Android.mk
View File

@ -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

14
libcamera2/QualcommCameraHardware.cpp
View File

@ -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;