From b3e372f1aae60dd4a4a140dca33c69844398e586 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 19 Mar 2012 16:57:03 -0700 Subject: Remove obsolete dependency on libmedia and unnecessary media includes Change-Id: Ic889aac0e12979d5c5fef6a58ee9917a4864039e --- libaudio/Android.mk | 2 +- libaudio/AudioHardware.cpp | 1 - libaudio/AudioHardware.h | 1 - libaudio/AudioPolicyManager.cpp | 1 - sec_mm/sec_omx/sec_osal/Android.mk | 3 +-- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libaudio/Android.mk b/libaudio/Android.mk index f7f9754..06dcf0d 100644 --- a/libaudio/Android.mk +++ b/libaudio/Android.mk @@ -27,7 +27,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := AudioPolicyManager.cpp -LOCAL_SHARED_LIBRARIES := libcutils libutils libmedia +LOCAL_SHARED_LIBRARIES := libcutils libutils LOCAL_STATIC_LIBRARIES := libmedia_helper LOCAL_WHOLE_STATIC_LIBRARIES := libaudiopolicy_legacy LOCAL_MODULE := audio_policy.herring diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp index 7a9440b..2169c60 100644 --- a/libaudio/AudioHardware.cpp +++ b/libaudio/AudioHardware.cpp @@ -32,7 +32,6 @@ #include #include "AudioHardware.h" -#include #include extern "C" { diff --git a/libaudio/AudioHardware.h b/libaudio/AudioHardware.h index a183a98..6ac64e8 100644 --- a/libaudio/AudioHardware.h +++ b/libaudio/AudioHardware.h @@ -24,7 +24,6 @@ #include #include -#include #include #include "secril-client.h" diff --git a/libaudio/AudioPolicyManager.cpp b/libaudio/AudioPolicyManager.cpp index bfa6c00..ce99972 100644 --- a/libaudio/AudioPolicyManager.cpp +++ b/libaudio/AudioPolicyManager.cpp @@ -18,7 +18,6 @@ //#define LOG_NDEBUG 0 #include #include "AudioPolicyManager.h" -#include namespace android_audio_legacy { diff --git a/sec_mm/sec_omx/sec_osal/Android.mk b/sec_mm/sec_omx/sec_osal/Android.mk index 00abe9f..a020149 100644 --- a/sec_mm/sec_omx/sec_osal/Android.mk +++ b/sec_mm/sec_omx/sec_osal/Android.mk @@ -26,8 +26,7 @@ LOCAL_SHARED_LIBRARIES := libcutils \ libutils \ libui \ libhardware \ - libandroid_runtime \ - libmedia + libandroid_runtime LOCAL_C_INCLUDES := $(SEC_OMX_INC)/khronos \ $(SEC_OMX_INC)/sec \ -- cgit v1.1