Merge "Remove unused libraries from various media libraries"
diff --git a/media/libmediaextractor/Android.bp b/media/libmediaextractor/Android.bp
index 1aa1e13..4758cd6 100644
--- a/media/libmediaextractor/Android.bp
+++ b/media/libmediaextractor/Android.bp
@@ -27,7 +27,6 @@
"libbinder",
"libstagefright_foundation",
"libutils",
- "libcutils",
"liblog",
],
diff --git a/media/libmediametrics/Android.bp b/media/libmediametrics/Android.bp
index 8f8c478..e188e54 100644
--- a/media/libmediametrics/Android.bp
+++ b/media/libmediametrics/Android.bp
@@ -10,11 +10,9 @@
],
shared_libs: [
- "libbase",
"libbinder",
"libcutils",
"liblog",
- "libstagefright_foundation",
"libutils",
],
diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index 3388ed9..249f2a4 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -146,7 +146,6 @@
"libdl",
"libdrmframework",
"libgui",
- "libion",
"liblog",
"libmedia",
"libmedia_omx",
@@ -154,7 +153,6 @@
"libmediaextractor",
"libmediametrics",
"libmediautils",
- "libnetd_client",
"libui",
"libutils",
"libmedia_helper",
@@ -162,7 +160,6 @@
"libstagefright_foundation",
"libstagefright_omx_utils",
"libstagefright_opus_common",
- "libstagefright_xmlparser",
"libRScpp",
"libhidlallocatorutils",
"libhidlbase",
@@ -171,8 +168,6 @@
"android.hidl.allocator@1.0",
"android.hardware.cas.native@1.0",
"android.hardware.media.omx@1.0",
- "android.hardware.graphics.allocator@2.0",
- "android.hardware.graphics.mapper@2.0",
],
static_libs: [
@@ -190,6 +185,7 @@
],
header_libs:[
+ "libstagefright_xmlparser_headers",
"media_ndk_headers",
],
diff --git a/media/libstagefright/HTTPBase.cpp b/media/libstagefright/HTTPBase.cpp
index 03e0d12..d118e8c 100644
--- a/media/libstagefright/HTTPBase.cpp
+++ b/media/libstagefright/HTTPBase.cpp
@@ -26,8 +26,6 @@
#include <cutils/properties.h>
#include <cutils/qtaguid.h>
-#include <NetdClient.h>
-
namespace android {
HTTPBase::HTTPBase()
diff --git a/media/libstagefright/bqhelper/Android.bp b/media/libstagefright/bqhelper/Android.bp
index 81777f1..218fe15 100644
--- a/media/libstagefright/bqhelper/Android.bp
+++ b/media/libstagefright/bqhelper/Android.bp
@@ -25,7 +25,6 @@
],
shared_libs: [
- "libbase",
"libbinder",
"libcutils",
"libgui",
@@ -38,8 +37,6 @@
"libutils",
"android.hardware.graphics.bufferqueue@1.0",
-
- "libnativewindow", // TODO(b/62923479): use header library
],
export_shared_lib_headers: [
diff --git a/media/libstagefright/flac/dec/Android.bp b/media/libstagefright/flac/dec/Android.bp
index 6bfab16..751b053 100644
--- a/media/libstagefright/flac/dec/Android.bp
+++ b/media/libstagefright/flac/dec/Android.bp
@@ -36,8 +36,6 @@
shared_libs: [
"liblog",
- "libstagefright_foundation",
- "libutils",
],
header_libs: ["libmedia_headers"],
}
diff --git a/media/libstagefright/omx/Android.bp b/media/libstagefright/omx/Android.bp
index 8a76de39..362b7f5 100644
--- a/media/libstagefright/omx/Android.bp
+++ b/media/libstagefright/omx/Android.bp
@@ -53,7 +53,6 @@
"libhidlbase",
"libhidlmemory",
"libhidltransport",
- "libnativewindow", // TODO(b/62923479): use header library
"libvndksupport",
"android.hardware.media.omx@1.0",
"android.hardware.graphics.bufferqueue@1.0",
diff --git a/media/libstagefright/xmlparser/Android.bp b/media/libstagefright/xmlparser/Android.bp
index b55dbb0..bebfb3b 100644
--- a/media/libstagefright/xmlparser/Android.bp
+++ b/media/libstagefright/xmlparser/Android.bp
@@ -1,3 +1,9 @@
+cc_library_headers {
+ name: "libstagefright_xmlparser_headers",
+ export_include_dirs: ["include"],
+ vendor_available: true,
+}
+
cc_library_shared {
name: "libstagefright_xmlparser",
vendor_available: true,
diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index 6976950..73bd2ca 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -88,7 +88,6 @@
"libandroid",
"libandroid_runtime",
"libbinder",
- "libhwbinder",
"libhidlbase",
"libgui",
"libui",
@@ -141,10 +140,6 @@
],
shared_libs: [
- "libstagefright_foundation",
- "liblog",
- "libutils",
- "libcutils",
],
sanitize: {
diff --git a/media/utils/Android.bp b/media/utils/Android.bp
index b05e022..a11602b 100644
--- a/media/utils/Android.bp
+++ b/media/utils/Android.bp
@@ -27,7 +27,6 @@
],
shared_libs: [
"libbinder",
- "libcutils",
"liblog",
"libutils",
"libmemunreachable",
diff --git a/services/medialog/Android.bp b/services/medialog/Android.bp
index ca96f62..bee5d25 100644
--- a/services/medialog/Android.bp
+++ b/services/medialog/Android.bp
@@ -9,10 +9,8 @@
shared_libs: [
"libaudioutils",
"libbinder",
- "libcutils",
"liblog",
"libmediautils",
- "libnbaio",
"libnblog",
"libutils",
],