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: 2016 pixel devices builds and boots. Camera functionalities work.
Change-Id: Idc25ce56ee5175aea4243fbce770f240ff0b62ca
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk
index 9f20fdb..cddf88d 100644
--- a/camera/QCamera2/Android.mk
+++ b/camera/QCamera2/Android.mk
@@ -95,11 +95,12 @@
endif
#LOCAL_STATIC_LIBRARIES := libqcamera2_util
+LOCAL_STATIC_LIBRARIES := android.hardware.camera.common@1.0-helper
LOCAL_C_INCLUDES += \
$(TARGET_OUT_HEADERS)/qcom/display
LOCAL_C_INCLUDES += \
hardware/qcom/display/msm8996/libqservice
-LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl libsync libgui
+LOCAL_SHARED_LIBRARIES := liblog libhardware libutils libcutils libdl libsync libgui
LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata
LOCAL_SHARED_LIBRARIES += libqdMetaData libqservice libbinder
LOCAL_SHARED_LIBRARIES += libcutils libdl
diff --git a/camera/QCamera2/HAL/QCameraParameters.h b/camera/QCamera2/HAL/QCameraParameters.h
index 1418796..b8f98ca 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
@@ -38,6 +38,8 @@
#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 {
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.h b/camera/QCamera2/HAL3/QCamera3HWI.h
index 72d8c81..35ba96e 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.h
+++ b/camera/QCamera2/HAL3/QCamera3HWI.h
@@ -31,7 +31,7 @@
#define __QCAMERA3HARDWAREINTERFACE_H__
// System dependencies
-#include <camera/CameraMetadata.h>
+#include <CameraMetadata.h>
#include <pthread.h>
#include <utils/KeyedVector.h>
#include <utils/List.h>
@@ -50,6 +50,7 @@
#include "mm_jpeg_interface.h"
}
+using ::android::hardware::camera::common::V1_0::helper::CameraMetadata;
using namespace android;
namespace qcamera {
diff --git a/camera/QCameraParameters.h b/camera/QCameraParameters.h
index 391ca44..a673e72 100755
--- a/camera/QCameraParameters.h
+++ b/camera/QCameraParameters.h
@@ -18,8 +18,10 @@
#define ANDROID_HARDWARE_QCAMERA_PARAMETERS_H
// Camera dependencies
-#include <camera/CameraParameters.h>
+#include <CameraParameters.h>
+using ::android::hardware::camera::common::V1_0::helper::CameraParameters;
+using ::android::hardware::camera::common::V1_0::helper::Size;
namespace android {
struct FPSRange{
