From 5ad98e1963a0df4584c9aac32a88093e37cb6e72 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Sat, 7 May 2022 11:02:35 +0900 Subject: [PATCH] universal7885: Make shim link against provider Also remove unused methods in shim --- universal7885-common/camera/provider/Android.bp | 1 + universal7885-common/libshims/camera/CorrectCameraID.cpp | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/universal7885-common/camera/provider/Android.bp b/universal7885-common/camera/provider/Android.bp index 789a7a4..3ca5f94 100644 --- a/universal7885-common/camera/provider/Android.bp +++ b/universal7885-common/camera/provider/Android.bp @@ -37,6 +37,7 @@ cc_binary { "libhidlbase", "liblog", "libutils", + "libcorrectcamera", ], static_libs: [ "android.hardware.camera.common@1.0-helper", diff --git a/universal7885-common/libshims/camera/CorrectCameraID.cpp b/universal7885-common/libshims/camera/CorrectCameraID.cpp index 101cc88..54b28a3 100644 --- a/universal7885-common/libshims/camera/CorrectCameraID.cpp +++ b/universal7885-common/libshims/camera/CorrectCameraID.cpp @@ -42,11 +42,6 @@ Return CameraDevice::getCameraCharacteristics( return Void(); } -Return CameraDevice::getEurekaCharacteristics( - ICameraDevice::getCameraCharacteristics_cb _hidl_cb) { - return CameraDevice::getCameraCharacteristics(_hidl_cb); -} - Return CameraDevice::open(const sp &callback, ICameraDevice::open_cb _hidl_cb) { Status status = initStatus(); @@ -151,10 +146,6 @@ Return CameraDevice::open(const sp &callback, _hidl_cb(status, session->getInterface()); return Void(); } -Return CameraDevice::nuke(const sp &callback, - ICameraDevice::open_cb _hidl_cb) { - return CameraDevice::open(callback, _hidl_cb); -} } // namespace implementation } // namespace V3_2 } // namespace device