commit 49ba82ce11a0d4d7c18ae7ef6c5196710ae82c0b
author Michael Stokes <mjstokes@google.com> Mon Oct 02 09:56:59 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 02 09:56:59 2023 +0000
tree 4cc8af218933ada624ff174638c4a5ce8c1f5320
parent 5e154097aa6291f9f2cd413c51b872d4b81b16aa

Revert "Convert from HIDL mapper to libui GraphicBufferMapper"

Revert submission 24747509-camera_fail2

Reason for revert: DroidMonitor-triggered revert due to breakage
b/302990858.

This may cause CtsAppOpsTestCases b/300115646 to fail again,
unfortunately (b/300115646).

Bug: 302990858
Reverted changes: /q/submissionid:24747509-camera_fail2

Change-Id: I0191b3ee88846f5b2c6e37ebd6be6d1369d9dba9

camera/common/default/Android.bp

diff --git a/camera/common/default/Android.bp b/camera/common/default/Android.bp
index b5d3095..e8c8f9d 100644
--- a/camera/common/default/Android.bp
+++ b/camera/common/default/Android.bp
@@ -30,12 +30,13 @@
         "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.