commit 523660cd87494ec5862e0c8cc6a1f37f2d6c70f5
author Devin Moore <devinmoore@google.com> Mon Oct 02 15:55:11 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 02 15:55:11 2023 +0000
tree ae1c7269251a627f9de84d050070107b25724e6e
parent 49ba82ce11a0d4d7c18ae7ef6c5196710ae82c0b

Revert "Revert "Convert from HIDL mapper to libui GraphicBufferM..."

Revert submission 24913374-revert-24747509-camera_fail2-OVHUVTAXRP

Reason for revert: 32-bit TV build is fixed with `%zu` instead of `%lu` for size_t argument.

Reverted changes: /q/submissionid:24913374-revert-24747509-camera_fail2-OVHUVTAXRP

Change-Id: I16287ce2dbea034db41450a3a5e9c3f729e76335

camera/common/default/Android.bp

diff --git a/camera/common/default/Android.bp b/camera/common/default/Android.bp
index e8c8f9d..b5d3095 100644
--- a/camera/common/default/Android.bp
+++ b/camera/common/default/Android.bp
@@ -30,13 +30,12 @@
         "libgralloctypes",
         "libhardware",
         "libcamera_metadata",
-        "android.hardware.graphics.mapper@2.0",
-        "android.hardware.graphics.mapper@3.0",
-        "android.hardware.graphics.mapper@4.0",
         "libexif",
+        "libui",
     ],
     include_dirs: ["system/media/private/camera/include"],
     export_include_dirs: ["include"],
+    export_shared_lib_headers: ["libui"],
 }
 
 // NOTE: Deprecated module kept for compatibility reasons.