diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-19 16:57:03 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-03-19 18:13:32 -0700 |
| commit | b3e372f1aae60dd4a4a140dca33c69844398e586 (patch) | |
| tree | cf7db93430be7d6c34ec64194513376d14c3e866 | |
| parent | c77b54c7b9122c3458d609215fa01ff34691c0ab (diff) | |
| download | device_samsung_crespo-b3e372f1aae60dd4a4a140dca33c69844398e586.zip device_samsung_crespo-b3e372f1aae60dd4a4a140dca33c69844398e586.tar.gz device_samsung_crespo-b3e372f1aae60dd4a4a140dca33c69844398e586.tar.bz2 | |
Remove obsolete dependency on libmedia
and unnecessary media includes
Change-Id: Ic889aac0e12979d5c5fef6a58ee9917a4864039e
| -rw-r--r-- | libaudio/Android.mk | 2 | ||||
| -rw-r--r-- | libaudio/AudioHardware.cpp | 1 | ||||
| -rw-r--r-- | libaudio/AudioHardware.h | 1 | ||||
| -rw-r--r-- | libaudio/AudioPolicyManager.cpp | 1 | ||||
| -rw-r--r-- | 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 <fcntl.h> #include "AudioHardware.h" -#include <media/AudioRecord.h> #include <audio_effects/effect_aec.h> 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 <utils/SortedVector.h> #include <hardware_legacy/AudioHardwareBase.h> -#include <media/mediarecorder.h> #include <hardware/audio_effect.h> #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 <utils/Log.h> #include "AudioPolicyManager.h" -#include <media/mediarecorder.h> 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 \ |