diff options
| author | Daniel Levin <dendy@ti.com> | 2012-11-20 13:20:34 +0200 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-11-20 13:20:34 +0200 |
| commit | aa9805030e082263ea7024ece147f8754f9ea4f6 (patch) | |
| tree | cd4eebfa841a8e1ee472f7ccea98f014248692e0 | |
| parent | 3126e4c44af301827a92388f015416f5acf747f6 (diff) | |
| download | common-open-aa9805030e082263ea7024ece147f8754f9ea4f6.tar.gz | |
audio: Disable OMAP Audio HAL without OMAP_ENHANCEMENT
Build should succeed without OMAP_ENHANCEMENT enabled.
Default Google Audio HAL will be used instead.
Also removed hack to duplicate enhancement tokens defined in:
system/core/include/system/audio.h
Change-Id: Ia7d545792c2b4f66b7261d44aa5aaa159edce10e
Signed-off-by: Daniel Levin <dendy@ti.com>
| -rw-r--r-- | audio/Android.mk | 2 | ||||
| -rw-r--r-- | audio/audio_hw.c | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/audio/Android.mk b/audio/Android.mk index d8cdc96..cf387e0 100644 --- a/audio/Android.mk +++ b/audio/Android.mk @@ -13,6 +13,7 @@ # limitations under the License. ifeq ($(findstring omap, $(TARGET_BOARD_PLATFORM)),omap) +ifdef OMAP_ENHANCEMENT LOCAL_PATH := $(call my-dir) @@ -59,3 +60,4 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) endif +endif diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 61e4448..1f0009f 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -28,16 +28,6 @@ #define LOGFUNC(...) (ALOGV(__VA_ARGS__)) #endif -#ifndef OMAP_ENHANCEMENT -/* Setting these values to zero effectively disables all the FM_RADIO - * code paths. - */ -#define AUDIO_DEVICE_OUT_FM_RADIO_TX 0 -#define AUDIO_DEVICE_IN_FM_RADIO_RX 0 -#define AUDIO_PARAMETER_STREAM_FM_ROUTING "fm_routing" -#define AUDIO_PARAMETER_STREAM_FM_MUTE "fm_mute" -#endif - #include <errno.h> #include <pthread.h> #include <stdint.h> |