Merge "Make AudioFlinger::instantiate() more resilient when called from separate module"

LOCAL_SRC_FILES += StateQueue.cpp

# uncomment for debugging timing problems related to StateQueue::push()

LOCAL_CFLAGS += -DSTATE_QUEUE_DUMP

LOCAL_C_INCLUDES := \

    $(call include-path-for, audio-effects) \

    $(call include-path-for, audio-utils)

LOCAL_MODULE:= libaudioflinger

LOCAL_SRC_FILES += FastMixer.cpp FastMixerState.cpp

LOCAL_CFLAGS += -DFAST_MIXER_STATISTICS

# uncomment to display CPU load adjusted for CPU frequency

# LOCAL_CFLAGS += -DCPU_FREQUENCY_STATISTICS

LOCAL_SRC_FILES += FastMixer.cpp FastMixerState.cpp AudioWatchdog.cpp

LOCAL_CFLAGS += -DSTATE_QUEUE_INSTANTIATIONS='"StateQueueInstantiations.cpp"'

LOCAL_CFLAGS += -UFAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE

# uncomment to allow tee sink debugging to be enabled by property

# LOCAL_CFLAGS += -DTEE_SINK

# uncomment to enable the audio watchdog

# LOCAL_SRC_FILES += AudioWatchdog.cpp

# LOCAL_CFLAGS += -DAUDIO_WATCHDOG

# Define ANDROID_SMP appropriately. Used to get inline tracing fast-path.

ifeq ($(TARGET_CPU_SMP),true)

    LOCAL_CFLAGS += -DANDROID_SMP=1

#define LOG_TAG "AudioFlinger"

//#define LOG_NDEBUG 0

#include "Configuration.h"

#include <dirent.h>

#include <math.h>

#include <signal.h>

#define LOG_TAG "AudioMixer"

//#define LOG_NDEBUG 0

#include "Configuration.h"

#include <stdint.h>

#include <string.h>

#include <stdlib.h>

#define LOG_TAG "AudioPolicyService"

//#define LOG_NDEBUG 0

#include "Configuration.h"

#undef __STRICT_ANSI__

#define __STDINT_LIMITS

#define __STDC_LIMIT_MACROS

#define LOG_TAG "AudioWatchdog"

//#define LOG_NDEBUG 0

#include "Configuration.h"

#include <utils/Log.h>

#include "AudioWatchdog.h"

#ifdef AUDIO_WATCHDOG

namespace android {

void AudioWatchdogDump::dump(int fd)

}

}   // namespace android

#endif // AUDIO_WATCHDOG