diff options
Diffstat (limited to 'common/hal/google_camera_hal/camera_provider.cc')
| -rw-r--r-- | common/hal/google_camera_hal/camera_provider.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/common/hal/google_camera_hal/camera_provider.cc b/common/hal/google_camera_hal/camera_provider.cc index fd00b58..ff1c807 100644 --- a/common/hal/google_camera_hal/camera_provider.cc +++ b/common/hal/google_camera_hal/camera_provider.cc @@ -26,9 +26,11 @@ #include "vendor_tag_defs.h" #include "vendor_tag_utils.h" -#if GCH_HWL_USE_DLOPEN // HWL layer implementation path -constexpr std::string_view kCameraHwlLib = "libgooglecamerahwl_impl.so"; +#if defined(_LP64) +std::string kCameraHwlLib = "/vendor/lib64/libgooglecamerahwl_impl.so"; +#else // defined(_LP64) +std::string kCameraHwlLib = "/vendor/lib/libgooglecamerahwl_impl.so"; #endif namespace android { @@ -299,11 +301,11 @@ status_t CameraProvider::CreateHwl( #if GCH_HWL_USE_DLOPEN CreateCameraProviderHwl_t create_hwl; - ALOGI("%s:Loading %s library", __FUNCTION__, kCameraHwlLib.data()); - hwl_lib_handle_ = dlopen(kCameraHwlLib.data(), RTLD_NOW); + ALOGI("%s:Loading %s library", __FUNCTION__, kCameraHwlLib.c_str()); + hwl_lib_handle_ = dlopen(kCameraHwlLib.c_str(), RTLD_NOW); if (hwl_lib_handle_ == nullptr) { - ALOGE("HWL loading %s failed due to error: %s", kCameraHwlLib.data(), + ALOGE("HWL loading %s failed due to error: %s", kCameraHwlLib.c_str(), dlerror()); return NO_INIT; } @@ -311,7 +313,7 @@ status_t CameraProvider::CreateHwl( create_hwl = (CreateCameraProviderHwl_t)dlsym(hwl_lib_handle_, "CreateCameraProviderHwl"); if (create_hwl == nullptr) { - ALOGE("%s: dlsym failed (%s).", __FUNCTION__, kCameraHwlLib.data()); + ALOGE("%s: dlsym failed (%s).", __FUNCTION__, kCameraHwlLib.c_str()); dlclose(hwl_lib_handle_); hwl_lib_handle_ = nullptr; return NO_INIT; |