diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-15 11:23:36 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-07-19 09:30:37 -0700 |
| commit | 153b9fe667e6e78e0218ff0159353097428c7657 (patch) | |
| tree | 360a76911071e362a94af32ccf67ce9619629708 /services/audioflinger/Android.mk | |
| parent | 20f4754b7e687d3718a0a0a585f2c9ac22e2567d (diff) | |
| download | frameworks_av-153b9fe667e6e78e0218ff0159353097428c7657.zip frameworks_av-153b9fe667e6e78e0218ff0159353097428c7657.tar.gz frameworks_av-153b9fe667e6e78e0218ff0159353097428c7657.tar.bz2 | |
Make AudioFlinger::instantiate() more resilient when called from separate module
Bug: 8834855
Change-Id: I4cd842cdfb09d2aaaaab9df9ac3bec6179709bd3
Diffstat (limited to 'services/audioflinger/Android.mk')
| -rw-r--r-- | services/audioflinger/Android.mk | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 714854e..54377f1 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -27,9 +27,6 @@ LOCAL_SRC_FILES:= \ 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) @@ -56,24 +53,10 @@ LOCAL_STATIC_LIBRARIES := \ 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 |