commit 7ca0db115dca06fc34b65ffe5b757549b84d1d2d
author Kris Alder <kalder@google.com> Wed Jul 08 16:54:34 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 08 16:54:34 2020 +0000
tree 55394b0105d0680fc049116eaa6a20257dd31fcc
parent d724fe0405f1c7e22b53deaf5dcb71e27206c747
parent d9d95bf8fed43dbb4dbc1742d2f3a543782ca7e6

Merge "libmedia_midiiowrapper: Add host support" am: a2060a1ab3 am: d9d95bf8fe

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1353487

Change-Id: I86163ab0cdc610d6bae8b5b42031845c732d8372

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 4ad780c..1caee04 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -219,7 +219,7 @@
     ],
 
     header_libs: [
-        "libmedia_headers",
+        "libmedia_datasource_headers",
         "media_ndk_headers",
     ],
 
@@ -236,6 +236,14 @@
         ],
         cfi: true,
     },
+
+    host_supported: true,
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }
 
 cc_library_shared {