Remove unneeded links with dynamic libraries
Various media components were linking against dynamic libraries that weren't needed.
Test: built and booted
Change-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e
diff --git a/camera/Android.mk b/camera/Android.mk
index 1a3382f..c9c98e9 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -58,8 +58,6 @@
libutils \
liblog \
libbinder \
- libhardware \
- libui \
libgui \
libcamera_metadata \
diff --git a/camera/cameraserver/Android.mk b/camera/cameraserver/Android.mk
index c0d75f3..888862a 100644
--- a/camera/cameraserver/Android.mk
+++ b/camera/cameraserver/Android.mk
@@ -25,7 +25,6 @@
libcutils \
libutils \
libbinder \
- libcamera_client
LOCAL_MODULE:= cameraserver
LOCAL_32_BIT_ONLY := true
diff --git a/drm/libmediadrm/Android.mk b/drm/libmediadrm/Android.mk
index c822433..270f291 100644
--- a/drm/libmediadrm/Android.mk
+++ b/drm/libmediadrm/Android.mk
@@ -14,13 +14,11 @@
LOCAL_SHARED_LIBRARIES := \
libbinder \
- libcrypto \
libcutils \
libdl \
liblog \
libmedia \
libstagefright \
- libstagefright_foundation \
libutils
LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall
diff --git a/media/audioserver/Android.mk b/media/audioserver/Android.mk
index 5ce1798..91cc902 100644
--- a/media/audioserver/Android.mk
+++ b/media/audioserver/Android.mk
@@ -13,7 +13,6 @@
liblog \
libmedia \
libmedialogservice \
- libnbaio \
libradioservice \
libsoundtriggerservice \
libutils
diff --git a/media/img_utils/src/Android.mk b/media/img_utils/src/Android.mk
index c1f64ca..4c6fe70 100644
--- a/media/img_utils/src/Android.mk
+++ b/media/img_utils/src/Android.mk
@@ -35,11 +35,8 @@
LOCAL_SHARED_LIBRARIES := \
liblog \
- libexpat \
libutils \
libcutils \
- libcamera_metadata \
- libcamera_client
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../include \
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index ca96098..452b98f 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -76,7 +76,7 @@
LOCAL_SHARED_LIBRARIES := \
libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \
libcamera_client libstagefright_foundation \
- libgui libdl libaudioutils libnbaio
+ libgui libdl libaudioutils
LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbinder
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 5270dea..97e7404 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -19,7 +19,6 @@
LOCAL_SHARED_LIBRARIES := \
libbinder \
- libcamera_client \
libcrypto \
libcutils \
libdrmframework \
@@ -29,14 +28,12 @@
libmedia \
libmediautils \
libmemunreachable \
- libsonivox \
libstagefright \
libstagefright_foundation \
libstagefright_httplive \
libstagefright_omx \
libstagefright_wfd \
libutils \
- libvorbisidec \
LOCAL_STATIC_LIBRARIES := \
libstagefright_nuplayer \
diff --git a/media/libnbaio/Android.bp b/media/libnbaio/Android.bp
index 45ad16f..615b541 100644
--- a/media/libnbaio/Android.bp
+++ b/media/libnbaio/Android.bp
@@ -22,7 +22,6 @@
// static_libs: ["libsndfile"],
shared_libs: [
- "libaudiohal",
"libaudioutils",
"libbinder",
"libcutils",
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 2c741db..4eacff5 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -72,6 +72,8 @@
$(TOP)/external/flac/include \
$(TOP)/external/tremolo \
$(TOP)/external/libvpx/libwebm \
+ $(TOP)/external/icu/icu4c/source/common \
+ $(TOP)/external/icu/icu4c/source/i18n \
$(TOP)/system/netd/include \
$(call include-path-for, audio-utils)
@@ -84,23 +86,15 @@
libdrmframework \
libexpat \
libgui \
- libicui18n \
- libicuuc \
liblog \
libmedia \
libmediautils \
libnetd_client \
- libopus \
libsonivox \
- libssl \
libstagefright_omx \
- libstagefright_yuv \
- libsync \
libui \
libutils \
libvorbisidec \
- libz \
- libpowermanager
LOCAL_STATIC_LIBRARIES := \
libstagefright_color_conversion \
@@ -118,8 +112,6 @@
libmedia_helper \
LOCAL_SHARED_LIBRARIES += \
- libstagefright_enc_common \
- libstagefright_avc_common \
libstagefright_foundation \
libdl \
libRScpp \
diff --git a/media/libstagefright/codecs/avc/enc/Android.mk b/media/libstagefright/codecs/avc/enc/Android.mk
index 8249d66..cfca608 100644
--- a/media/libstagefright/codecs/avc/enc/Android.mk
+++ b/media/libstagefright/codecs/avc/enc/Android.mk
@@ -61,12 +61,10 @@
LOCAL_SHARED_LIBRARIES := \
libmedia \
libstagefright_avc_common \
- libstagefright_enc_common \
libstagefright_foundation \
libstagefright_omx \
libutils \
liblog \
- libui
LOCAL_MODULE := libstagefright_soft_h264enc
diff --git a/media/libstagefright/codecs/avcenc/Android.mk b/media/libstagefright/codecs/avcenc/Android.mk
index 2d24584..1b1a1a0 100644
--- a/media/libstagefright/codecs/avcenc/Android.mk
+++ b/media/libstagefright/codecs/avcenc/Android.mk
@@ -17,7 +17,6 @@
LOCAL_SHARED_LIBRARIES := libmedia
LOCAL_SHARED_LIBRARIES += libstagefright_omx
-LOCAL_SHARED_LIBRARIES += libstagefright_foundation
LOCAL_SHARED_LIBRARIES += libutils
LOCAL_SHARED_LIBRARIES += liblog
diff --git a/media/libstagefright/codecs/g711/dec/Android.mk b/media/libstagefright/codecs/g711/dec/Android.mk
index b002208..11978a1 100644
--- a/media/libstagefright/codecs/g711/dec/Android.mk
+++ b/media/libstagefright/codecs/g711/dec/Android.mk
@@ -9,7 +9,7 @@
frameworks/native/include/media/openmax
LOCAL_SHARED_LIBRARIES := \
- libmedia libstagefright_omx libstagefright_foundation libutils liblog
+ libmedia libstagefright_omx libutils liblog
LOCAL_MODULE := libstagefright_soft_g711dec
LOCAL_MODULE_TAGS := optional
diff --git a/media/libstagefright/codecs/gsm/dec/Android.mk b/media/libstagefright/codecs/gsm/dec/Android.mk
index 5d6c289..eed1348 100644
--- a/media/libstagefright/codecs/gsm/dec/Android.mk
+++ b/media/libstagefright/codecs/gsm/dec/Android.mk
@@ -13,7 +13,7 @@
LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow
LOCAL_SHARED_LIBRARIES := \
- libmedia libstagefright_omx libstagefright_foundation libutils liblog
+ libmedia libstagefright_omx libutils liblog
LOCAL_STATIC_LIBRARIES := \
libgsm
diff --git a/media/libstagefright/codecs/m4v_h263/enc/Android.mk b/media/libstagefright/codecs/m4v_h263/enc/Android.mk
index 1ff8b47..7b706fe 100644
--- a/media/libstagefright/codecs/m4v_h263/enc/Android.mk
+++ b/media/libstagefright/codecs/m4v_h263/enc/Android.mk
@@ -64,13 +64,9 @@
LOCAL_SHARED_LIBRARIES := \
libmedia \
- libstagefright_enc_common \
- libstagefright_foundation \
libstagefright_omx \
libutils \
liblog \
- libui
-
LOCAL_MODULE := libstagefright_soft_mpeg4enc
LOCAL_MODULE_TAGS := optional
diff --git a/media/libstagefright/codecs/on2/enc/Android.mk b/media/libstagefright/codecs/on2/enc/Android.mk
index f8019d0..5c85bbd 100644
--- a/media/libstagefright/codecs/on2/enc/Android.mk
+++ b/media/libstagefright/codecs/on2/enc/Android.mk
@@ -20,7 +20,6 @@
LOCAL_SHARED_LIBRARIES := \
libmedia libstagefright_omx libstagefright_foundation libutils liblog \
- libhardware \
LOCAL_MODULE := libstagefright_soft_vpxenc
LOCAL_MODULE_TAGS := optional
diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk
index ee4fc05..72f8043 100644
--- a/media/libstagefright/omx/Android.mk
+++ b/media/libstagefright/omx/Android.mk
@@ -21,7 +21,6 @@
LOCAL_SHARED_LIBRARIES := \
libbinder \
- libhardware \
libmedia \
libutils \
liblog \
diff --git a/media/libstagefright/wifi-display/Android.mk b/media/libstagefright/wifi-display/Android.mk
index 902f66c..c5322a4 100644
--- a/media/libstagefright/wifi-display/Android.mk
+++ b/media/libstagefright/wifi-display/Android.mk
@@ -24,7 +24,6 @@
libbinder \
libcutils \
liblog \
- libgui \
libmedia \
libstagefright \
libstagefright_foundation \
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index f3f3b1a..ffbfcbb 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -15,13 +15,9 @@
main_mediaserver.cpp
LOCAL_SHARED_LIBRARIES := \
- libcamera_metadata \
- libcamera_client \
- libcameraservice \
libresourcemanagerservice \
liblog \
libcutils \
- libmedia \
libmediaplayerservice \
libutils \
libbinder \
@@ -33,7 +29,6 @@
LOCAL_C_INCLUDES := \
frameworks/av/media/libmediaplayerservice \
- frameworks/av/services/camera/libcameraservice \
frameworks/av/services/mediaresourcemanager \
LOCAL_MODULE:= mediaserver
diff --git a/media/ndk/Android.mk b/media/ndk/Android.mk
index 74729e4..a4f999f 100644
--- a/media/ndk/Android.mk
+++ b/media/ndk/Android.mk
@@ -45,7 +45,6 @@
LOCAL_SHARED_LIBRARIES := \
libbinder \
libmedia \
- libmediadrm \
libstagefright \
libstagefright_foundation \
liblog \
diff --git a/radio/Android.mk b/radio/Android.mk
index 0377328..be5d283 100644
--- a/radio/Android.mk
+++ b/radio/Android.mk
@@ -27,7 +27,6 @@
libutils \
liblog \
libbinder \
- libhardware \
libradio_metadata
#LOCAL_C_INCLUDES += \
diff --git a/services/audiopolicy/Android.mk b/services/audiopolicy/Android.mk
index d598e7e..91cc3d2 100644
--- a/services/audiopolicy/Android.mk
+++ b/services/audiopolicy/Android.mk
@@ -31,7 +31,6 @@
liblog \
libbinder \
libmedia \
- libhardware \
libhardware_legacy \
libserviceutility
diff --git a/services/audiopolicy/enginedefault/Android.mk b/services/audiopolicy/enginedefault/Android.mk
index b247e21..e6de8ae 100644
--- a/services/audiopolicy/enginedefault/Android.mk
+++ b/services/audiopolicy/enginedefault/Android.mk
@@ -43,6 +43,5 @@
liblog \
libcutils \
libutils \
- libaudioutils \
include $(BUILD_SHARED_LIBRARY)
diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk
index 89a1bb6..7feed6b 100644
--- a/services/camera/libcameraservice/Android.mk
+++ b/services/camera/libcameraservice/Android.mk
@@ -65,12 +65,11 @@
libcamera_client \
libgui \
libhardware \
- libsync \
libcamera_metadata \
libjpeg \
libmemunreachable
-LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbinder
+LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbinder libcamera_client
LOCAL_C_INCLUDES += \
system/media/private/camera/include \
diff --git a/services/mediadrm/Android.mk b/services/mediadrm/Android.mk
index 8baaf13..4ce5c38 100644
--- a/services/mediadrm/Android.mk
+++ b/services/mediadrm/Android.mk
@@ -27,14 +27,8 @@
liblog \
libmedia \
libmediadrm \
- libmediaplayerservice \
- libstagefright \
- libui \
libutils \
-LOCAL_C_INCLUDES := \
- frameworks/av/media/libmediaplayerservice \
-
LOCAL_CFLAGS += -Wall -Wextra -Werror
LOCAL_MODULE:= mediadrmserver
diff --git a/services/radio/Android.mk b/services/radio/Android.mk
index f5d74d3..10be713 100644
--- a/services/radio/Android.mk
+++ b/services/radio/Android.mk
@@ -21,7 +21,6 @@
RadioService.cpp
LOCAL_SHARED_LIBRARIES:= \
- libui \
liblog \
libutils \
libbinder \
diff --git a/services/soundtrigger/Android.mk b/services/soundtrigger/Android.mk
index f719dc9..2533132 100644
--- a/services/soundtrigger/Android.mk
+++ b/services/soundtrigger/Android.mk
@@ -24,7 +24,6 @@
SoundTriggerHwService.cpp
LOCAL_SHARED_LIBRARIES:= \
- libui \
liblog \
libutils \
libbinder \
diff --git a/soundtrigger/Android.mk b/soundtrigger/Android.mk
index c794cc1..e29adbf 100644
--- a/soundtrigger/Android.mk
+++ b/soundtrigger/Android.mk
@@ -27,7 +27,6 @@
libutils \
liblog \
libbinder \
- libhardware
#LOCAL_C_INCLUDES += \
system/media/camera/include \