camerserver: Remove dependency on libmediandk.
libmediandk brings in many unneeded dependencies which results in
an abnormal increase in vss. AImageReader_getHGBPFromHandle has been
moved to libmediautils.
Test: mm -j64
Test: showmap <pid of cameraserver> vss before change: 50628
Test: showmap <pid of cameraserver> vss after change: 31256
Change-Id: I4de95d08ae514c252a1e01f3b03e0021c821b72a
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 9f2515e..025f0b2 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -72,7 +72,6 @@
"libbinder",
"libcutils",
"libmedia",
- "libmediandk",
"libmediautils",
"libcamera_client",
"libcamera_metadata",
diff --git a/services/camera/libcameraservice/hidl/Convert.cpp b/services/camera/libcameraservice/hidl/Convert.cpp
index 22e879e..d2a4ed6 100644
--- a/services/camera/libcameraservice/hidl/Convert.cpp
+++ b/services/camera/libcameraservice/hidl/Convert.cpp
@@ -16,7 +16,8 @@
#include <hidl/Convert.h>
#include <gui/bufferqueue/1.0/H2BGraphicBufferProducer.h>
-#include <NdkImageReaderPriv.h>
+#include <cutils/native_handle.h>
+#include <mediautils/AImageReaderUtils.h>
namespace android {
namespace hardware {
@@ -25,6 +26,7 @@
namespace conversion {
using hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer;
+using aimg::AImageReader_getHGBPFromHandle;
// Note: existing data in dst will be gone. Caller still owns the memory of src
void convertToHidl(const camera_metadata_t *src, HCameraMetadata* dst) {