commit 90340a66d68225e1011cd5feaadf361e15eed1f6
author Colin Cross <ccross@android.com> Fri Mar 04 22:48:58 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 04 22:48:58 2022 +0000
tree fe9300ed770c6ac5531099d417f83a08320b5f84
parent 6a7c42909a27c3000017d690be7411675e5c8c09
parent c25e2bf6ab3ff2f9b499c820587673c586f2fb45

Merge "libmpeg2extractor: add dependency on libmedia_helper"

media/extractors/mpeg2/Android.bp

diff --git a/media/extractors/mpeg2/Android.bp b/media/extractors/mpeg2/Android.bp
index 7e6247b..4f0796e 100644
--- a/media/extractors/mpeg2/Android.bp
+++ b/media/extractors/mpeg2/Android.bp
@@ -61,6 +61,7 @@
         "libhidlbase",
         "libhidlmemory",
         "libjsoncpp",
+        "libmedia_helper",
         "libprocessgroup",
         "libstagefright_esds",
         "libstagefright_foundation_without_imemory",

media/libmediahelper/Android.bp

diff --git a/media/libmediahelper/Android.bp b/media/libmediahelper/Android.bp
index a433fc6..b9d795d 100644
--- a/media/libmediahelper/Android.bp
+++ b/media/libmediahelper/Android.bp
@@ -29,6 +29,7 @@
 cc_library {
     name: "libmedia_helper",
     vendor_available: true,
+    min_sdk_version: "29",
     vndk: {
         enabled: true,
     },
@@ -58,4 +59,9 @@
             enabled: false,
         },
     },
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media",
+        "test_com.android.media",
+    ],
 }