From 98faf558961de3300c3d828c3baea15e885ffe3b Mon Sep 17 00:00:00 2001
From: Wonsik Kim <wonsik@google.com>
Date: Wed, 30 Aug 2023 11:15:57 -0700
Subject: [PATCH] media.c2: add apex_available and set minsdk to 31

Test: m
Change-Id: Id5c266823f99a810cc69b31fff8e8be727c74031
---
 media/c2/aidl/Android.bp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/media/c2/aidl/Android.bp b/media/c2/aidl/Android.bp
index 75d74ac5a5..3f2cadb46c 100644
--- a/media/c2/aidl/Android.bp
+++ b/media/c2/aidl/Android.bp
@@ -11,11 +11,12 @@ package {
 
 aidl_interface {
     name: "android.hardware.media.c2",
+    min_sdk_version: "31",
     vendor_available: true,
     double_loadable: true,
     srcs: ["android/hardware/media/c2/*.aidl"],
-    include_dirs: [
-        "frameworks/base/core/java",
+    headers: [
+        "HardwareBuffer_aidl",
     ],
     imports: [
         "android.hardware.common-V2",
@@ -31,6 +32,11 @@ aidl_interface {
         },
         ndk: {
             enabled: true,
+            apex_available: [
+                "//apex_available:platform",
+                "com.android.media.swcodec",
+                "test_com.android.media.swcodec",
+            ],
             additional_shared_libraries: [
                 "libnativewindow",
             ],