commit 593fb5458572fbe128fdc01ef59663bd36e1e3a0
author Eino-Ville Talvala (Eddy) <etalvala@google.com> Mon Oct 21 18:00:21 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 21 18:00:21 2024 +0000
tree b52426107df30b04b54ffa467ba45785d948c7d2
parent 63ba749c69cec8e914d9d22cb8d0e42cfe94e982
parent 2234d04be1af6132b741913db5640c8bcb6db052

Merge "Modules: Update dependencies on graphics.common HAL to use defaults" into main

media/module/aidlpersistentsurface/Android.bp

diff --git a/media/module/aidlpersistentsurface/Android.bp b/media/module/aidlpersistentsurface/Android.bp
index 5c1a010..8b273f3 100644
--- a/media/module/aidlpersistentsurface/Android.bp
+++ b/media/module/aidlpersistentsurface/Android.bp
@@ -3,6 +3,9 @@
     unstable: true,
     local_include_dir: "aidl",
     min_sdk_version: "29",
+    defaults: [
+        "android.hardware.graphics.common-latest"
+    ],
     srcs: [
         "aidl/android/media/AidlColorAspects.aidl",
         "aidl/android/media/IAidlGraphicBufferSource.aidl",
@@ -12,9 +15,6 @@
     headers: [
         "HardwareBuffer_aidl",
     ],
-    imports: [
-        "android.hardware.graphics.common-V5",
-    ],
     include_dirs: [
         "frameworks/native/aidl/gui",
     ],
@@ -41,6 +41,9 @@
 cc_library_shared {
     name: "libstagefright_graphicbuffersource_aidl",
     min_sdk_version: "29",
+    defaults: [
+        "android.hardware.graphics.common-ndk_shared",
+    ],
     srcs: [
         "AidlGraphicBufferSource.cpp",
         "wrapper/WAidlGraphicBufferSource.cpp",
@@ -56,7 +59,6 @@
         "media_plugin_headers",
     ],
     shared_libs: [
-        "android.hardware.graphics.common-V5-ndk",
         "graphicbuffersource-aidl-ndk",
         "libbinder_ndk",
         "libcutils",