commit e87ca15798818040d03e1b85d9840708bc30e9b6
author Kris Alder <kalder@google.com> Wed Jun 24 16:45:12 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 24 16:45:12 2020 +0000
tree 1ee1a96a56f77d1a25e1aef622c776c9309c66d5
parent 6d65666280938cbf4554d295fa723dffa04ffccb
parent a5bf77d59db9642254e48d2ca56e658b9017058d

Merge changes I6991827a,I85299a83

* changes:
  Add host support in extractor libraries
  libstagefright_metadatautils: Add host support

media/extractors/aac/Android.bp

diff --git a/media/extractors/aac/Android.bp b/media/extractors/aac/Android.bp
index 60d3ae1..c036bb5 100644
--- a/media/extractors/aac/Android.bp
+++ b/media/extractors/aac/Android.bp
@@ -10,4 +10,11 @@
         "libutils",
     ],
 
+    host_supported: true,
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }

media/extractors/flac/Android.bp

diff --git a/media/extractors/flac/Android.bp b/media/extractors/flac/Android.bp
index 3675611..42cc161 100644
--- a/media/extractors/flac/Android.bp
+++ b/media/extractors/flac/Android.bp
@@ -20,4 +20,12 @@
         "libutils",
     ],
 
+    host_supported: true,
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+
 }

media/extractors/mkv/Android.bp

diff --git a/media/extractors/mkv/Android.bp b/media/extractors/mkv/Android.bp
index 7ad8cc1..330d4fe 100644
--- a/media/extractors/mkv/Android.bp
+++ b/media/extractors/mkv/Android.bp
@@ -21,4 +21,12 @@
         "libutils",
     ],
 
+    host_supported: true,
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+
 }

media/extractors/mp3/Android.bp

diff --git a/media/extractors/mp3/Android.bp b/media/extractors/mp3/Android.bp
index 102ac81..7d70548 100644
--- a/media/extractors/mp3/Android.bp
+++ b/media/extractors/mp3/Android.bp
@@ -13,4 +13,11 @@
         "libstagefright_foundation",
     ],
 
+    host_supported: true,
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }

media/extractors/ogg/Android.bp

diff --git a/media/extractors/ogg/Android.bp b/media/extractors/ogg/Android.bp
index 7aed683..579065e 100644
--- a/media/extractors/ogg/Android.bp
+++ b/media/extractors/ogg/Android.bp
@@ -20,4 +20,11 @@
         "libvorbisidec",
     ],
 
+    host_supported: true,
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }

media/libstagefright/Android.bp

diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index 1761ec0..da5ed73 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -70,9 +70,18 @@
     },
 
     header_libs: [
+        "libaudioclient_headers",
         "libstagefright_foundation_headers",
+        "media_ndk_headers",
     ],
-    shared_libs: ["libmediandk"],
+
+    host_supported: true,
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+
     export_include_dirs: ["include"],
 }