commit 2e183841dcca6dbf94ebb83fa8d8df929496b4c7
author Kris Alder <kalder@google.com> Wed Jul 08 17:12:26 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 08 17:12:26 2020 +0000
tree d78c85e61ae02b2a3d3d42a9a8efdcf1ce906314
parent ad24db5359013e572c1d46457237902d5ef948da
parent b55c5a417d219592eac7d588b89d5a6c917e0bcb

Merge "libmedia_midiiowrapper: Add host support" am: a2060a1ab3 am: d9d95bf8fe am: 7ca0db115d am: 9705c6174b am: b55c5a417d

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

Change-Id: I5925e171186851081557959c1291b637759a8f4f

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 {