summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eino-Ville Talvala (Eddy) <etalvala@google.com> 2024-12-06 21:44:27 +0000
committer Xin Li <delphij@google.com> 2024-12-06 23:11:48 +0000
commit36b205f17fee5dfa3dd1bc008b3d148fb77208ae (patch)
tree8e4bb594db942a97532904cae22690658472358f
parent728da1622a8404d12d9a6052280c81fd6395a5d0 (diff)
parent7dab4e8b9fe3b65b90c09573158f1dd8f25a7b65 (diff)
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>
-rw-r--r--libs/gralloc/types/Android.bp2
-rw-r--r--libs/graphicsenv/GraphicsEnv.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/gralloc/types/Android.bp b/libs/gralloc/types/Android.bp
index 8dabc2c79e..f9f304a812 100644
--- a/libs/gralloc/types/Android.bp
+++ b/libs/gralloc/types/Android.bp
@@ -56,7 +56,7 @@ cc_library {
],
export_shared_lib_headers: [
- "android.hardware.graphics.common-V5-ndk",
+ "android.hardware.graphics.common-V6-ndk",
"android.hardware.graphics.mapper@4.0",
"libhidlbase",
],
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index d1a56635f5..a8d5fe7371 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -92,7 +92,7 @@ static const char* kFormerlyVndkspLibrariesList =
"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:"