commit 36b205f17fee5dfa3dd1bc008b3d148fb77208ae
author Eino-Ville Talvala (Eddy) <etalvala@google.com> Fri Dec 06 21:44:27 2024 +0000
committer Xin Li <delphij@google.com> Fri Dec 06 23:11:48 2024 +0000
tree 8e4bb594db942a97532904cae22690658472358f
parent 728da1622a8404d12d9a6052280c81fd6395a5d0
parent 7dab4e8b9fe3b65b90c09573158f1dd8f25a7b65

Merge "Update dependencies on graphics.common HAL to latest" into main am: 7dab4e8b9f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3341054

Merged-In: I8e33403098f6e7e573d3cac58bba7ce290c61206
Change-Id: I1b3f8619ec88ef52acb60c3022fe8b2fab045205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/gralloc/types/Android.bp

diff --git a/libs/gralloc/types/Android.bp b/libs/gralloc/types/Android.bp
index 8dabc2c..f9f304a 100644
--- a/libs/gralloc/types/Android.bp
+++ b/libs/gralloc/types/Android.bp
@@ -56,7 +56,7 @@
     ],
 
     export_shared_lib_headers: [
-        "android.hardware.graphics.common-V5-ndk",
+        "android.hardware.graphics.common-V6-ndk",
         "android.hardware.graphics.mapper@4.0",
         "libhidlbase",
     ],

libs/graphicsenv/GraphicsEnv.cpp

diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index d1a5663..a8d5fe7 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -92,7 +92,7 @@
     "android.hardware.common-V2-ndk.so:"
     "android.hardware.common.fmq-V1-ndk.so:"
     "android.hardware.graphics.allocator-V2-ndk.so:"
-    "android.hardware.graphics.common-V5-ndk.so:"
+    "android.hardware.graphics.common-V6-ndk.so:"
     "android.hardware.graphics.common@1.0.so:"
     "android.hardware.graphics.common@1.1.so:"
     "android.hardware.graphics.common@1.2.so:"