commit b6f7880bad6bdcd32cd402fdfe51376f9fa99607
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jun 07 21:38:19 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 07 21:38:19 2023 +0000
tree 8b9e9df0e20e1de8d8fd82f88d52f93722177d16
parent 7967c1a9e440ff228a2164846d646d2752e07c4f
parent d62508c79eee0df445b660e89437f201a1f0509a

Merge "Mark media.bufferpool2 and media.c2 as double-loadable" am: d62508c79e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611868

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

media/bufferpool/aidl/Android.bp

diff --git a/media/bufferpool/aidl/Android.bp b/media/bufferpool/aidl/Android.bp
index 68ac489..5ea2948 100644
--- a/media/bufferpool/aidl/Android.bp
+++ b/media/bufferpool/aidl/Android.bp
@@ -24,6 +24,7 @@
 aidl_interface {
     name: "android.hardware.media.bufferpool2",
     vendor_available: true,
+    double_loadable: true,
     srcs: ["android/hardware/media/bufferpool2/*.aidl"],
     imports: [
         "android.hardware.common-V2",

media/c2/aidl/Android.bp

diff --git a/media/c2/aidl/Android.bp b/media/c2/aidl/Android.bp
index 3393ede..56531db 100644
--- a/media/c2/aidl/Android.bp
+++ b/media/c2/aidl/Android.bp
@@ -12,6 +12,7 @@
 aidl_interface {
     name: "android.hardware.media.c2",
     vendor_available: true,
+    double_loadable: true,
     srcs: ["android/hardware/media/c2/*.aidl"],
     include_dirs: [
         "frameworks/native/aidl/gui",