diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-20 23:23:02 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-20 23:23:02 +0000 |
commit | 02593db6154b985c5e9ce84e5ff7bd4a128e1965 (patch) | |
tree | b28b5cd7b18f0908d5be4f63b0365f7868dbb589 | |
parent | 2698ff041392965ec5dc8552928dadbec381fab8 (diff) | |
parent | da7d1282854ee4b5c04e1024b66797e6ab09e9ea (diff) | |
download | camera-android13-qpr1-s3-release.tar.gz |
Snap for 9084753 from da7d1282854ee4b5c04e1024b66797e6ab09e9ea to tm-qpr1-releaseandroid-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-release
Change-Id: Ic63813dddc07261110f36939a72eb09006901c0b
-rw-r--r-- | common/hal/google_camera_hal/camera_provider.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/hal/google_camera_hal/camera_provider.cc b/common/hal/google_camera_hal/camera_provider.cc index 2d816eb..30e184d 100644 --- a/common/hal/google_camera_hal/camera_provider.cc +++ b/common/hal/google_camera_hal/camera_provider.cc @@ -23,6 +23,9 @@ #include <log/log.h> #include <utils/Trace.h> +#if !GCH_HWL_USE_DLOPEN +#include "lyric_hwl/madvise_library_list.h" +#endif #include "vendor_tag_defs.h" #include "vendor_tag_utils.h" @@ -282,6 +285,8 @@ status_t CameraProvider::CreateCameraDevice( #if GCH_HWL_USE_DLOPEN configure_streams_libs = reinterpret_cast<decltype(configure_streams_libs)>( dlsym(hwl_lib_handle_, "configure_streams_libraries")); +#else + configure_streams_libs = &configure_streams_libraries; #endif *device = CameraDevice::Create(std::move(camera_device_hwl), |