diff options
| author | Jiyong Park <jiyong@google.com> | 2017-06-12 17:16:36 +0900 |
|---|---|---|
| committer | Cosme Domínguez Díaz <cosme.ddiaz@gmail.com> | 2018-07-06 21:23:07 +0200 |
| commit | 2fde7fd5a30f86d2c9fea396ab3bcddead157e25 (patch) | |
| tree | c478ea1d723ba03c5e655be2c2e51f70b1da8cda /camera/QCamera2/HAL/QCameraParameters.h | |
| parent | c1184ef494e5b7ec0fa67421826f1f123206f433 (diff) | |
msm8996-common: Replace libcamera_client to android.hardware.camera.common@1.0-helper
libcamera_client is not a VNDK library and thus not available to
vendors. These vendor libs were using the library due to CameraMetadata
and CameraParamters classes. The classes are now available via
.common@1.0-helper library which is available to vendors. Thus switching
to the lib.
Bug: 62523241
Test: 2017 pixel devices builds and boots. Camera functionalities work.
Change-Id: I16d0fcf94b54c480b8e817c63341fb9f45118867
Diffstat (limited to 'camera/QCamera2/HAL/QCameraParameters.h')
| -rw-r--r-- | camera/QCamera2/HAL/QCameraParameters.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/camera/QCamera2/HAL/QCameraParameters.h b/camera/QCamera2/HAL/QCameraParameters.h index 00c1cab..ee00117 100644 --- a/camera/QCamera2/HAL/QCameraParameters.h +++ b/camera/QCamera2/HAL/QCameraParameters.h @@ -24,7 +24,7 @@ #include <cutils/properties.h> // System dependencies -//#include <camera/CameraParameters.h> +#include <CameraParameters.h> #include <utils/Errors.h> // Camera dependencies @@ -33,13 +33,14 @@ #include "QCameraParametersIntf.h" #include "QCameraThermalAdapter.h" #include "QCameraCommon.h" -#include "CameraParameters.h" extern "C" { #include "mm_jpeg_interface.h" } +using ::android::hardware::camera::common::V1_0::helper::CameraParameters; +using ::android::hardware::camera::common::V1_0::helper::Size; using namespace android; namespace qcamera { |