From 2fde7fd5a30f86d2c9fea396ab3bcddead157e25 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 12 Jun 2017 17:16:36 +0900 Subject: 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 --- camera/QCamera2/HAL3/QCamera3HWI.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'camera/QCamera2/HAL3/QCamera3HWI.h') diff --git a/camera/QCamera2/HAL3/QCamera3HWI.h b/camera/QCamera2/HAL3/QCamera3HWI.h index b093996..dce632d 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.h +++ b/camera/QCamera2/HAL3/QCamera3HWI.h @@ -31,10 +31,10 @@ #define __QCAMERA3HARDWAREINTERFACE_H__ // System dependencies +#include #include #include #include -#include "CameraMetadata.h" // Camera dependencies #include "hardware/camera3.h" @@ -50,13 +50,12 @@ extern "C" { #include "mm_jpeg_interface.h" } +using ::android::hardware::camera::common::V1_0::helper::CameraMetadata; using namespace android; namespace qcamera { -using ::android::hardware::camera::common::V1_0::helper::CameraMetadata; - #ifndef TRUE #define TRUE 1 #endif -- cgit v1.2.3