Merge changes I8097e8e0,I07e1dd05,If5059c6c
* changes:
mp4_extractor_fuzzer: Add host support
libmp4extractor: Add host support
extractor-defaults: Updated library list
diff --git a/media/extractors/Android.bp b/media/extractors/Android.bp
index 4ed57eb..96b1e84 100644
--- a/media/extractors/Android.bp
+++ b/media/extractors/Android.bp
@@ -21,7 +21,6 @@
shared_libs: [
"liblog",
- "libmediandk#29",
],
// extractors are supposed to work on Q(29)
@@ -39,6 +38,21 @@
version_script: "exports.lds",
+ target: {
+ android: {
+ shared_libs: [
+ "libmediandk#29",
+ ],
+ },
+ host: {
+ static_libs: [
+ "libutils",
+ "libmediandk_format",
+ "libmedia_ndkformatpriv",
+ ],
+ },
+ },
+
sanitize: {
cfi: true,
misc_undefined: [
diff --git a/media/extractors/fuzzers/Android.bp b/media/extractors/fuzzers/Android.bp
index 818e466..0a70815 100644
--- a/media/extractors/fuzzers/Android.bp
+++ b/media/extractors/fuzzers/Android.bp
@@ -71,10 +71,15 @@
"frameworks/av/media/extractors/mp4",
],
+ header_libs: [
+ "libaudioclient_headers",
+ ],
+
static_libs: [
"liblog",
"libstagefright_foundation",
- "libmedia",
+ "libmediandk_format",
+ "libmedia_ndkformatpriv",
"libextractorfuzzerbase",
"libstagefright_id3",
"libstagefright_esds",
@@ -83,7 +88,6 @@
shared_libs: [
"libutils",
- "libmediandk",
"libbinder",
],
@@ -95,6 +99,8 @@
],
componentid: 155276,
},
+
+ host_supported: true,
}
cc_fuzz {
diff --git a/media/extractors/mp4/Android.bp b/media/extractors/mp4/Android.bp
index e48e1b7..afa055f 100644
--- a/media/extractors/mp4/Android.bp
+++ b/media/extractors/mp4/Android.bp
@@ -16,4 +16,12 @@
"libstagefright_id3",
"libutils",
],
+
+ host_supported: true,
+
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ },
}