commit 6590f39160adf2b3cc2e68429d93c953f66d820c
author Wonsik Kim <wonsik@google.com> Fri Sep 22 22:39:24 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 22 22:39:24 2023 +0000
tree 66fa768234d18be129fd1689f0f2ec409ee1dad5
parent 2abfe4abc7d1537fd14c3c33698f0275f090ca49
parent bea101032f871e3b52caf3f8a5f734d9bddeec3c

Merge "media.c2: add apex_available and set minsdk to 31" into main am: bea101032f

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

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

media/c2/aidl/Android.bp

diff --git a/media/c2/aidl/Android.bp b/media/c2/aidl/Android.bp
index 75d74ac..3f2cadb 100644
--- a/media/c2/aidl/Android.bp
+++ b/media/c2/aidl/Android.bp
@@ -11,11 +11,12 @@
 
 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 @@
         },
         ndk: {
             enabled: true,
+            apex_available: [
+                "//apex_available:platform",
+                "com.android.media.swcodec",
+                "test_com.android.media.swcodec",
+            ],
             additional_shared_libraries: [
                 "libnativewindow",
             ],