summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-05-13 23:50:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-13 23:50:07 +0000
commitcbe6fddebe3ec84176037de7f9681d2407fa1113 (patch)
tree80ec447e3c332e378290e819dc5509b7acaec2a9
parent2d859b91a59b4f6d63ff2bd93b462cab60f4a8d7 (diff)
parent5b17c0b5b418c340d3e5201a72ee8c88c1755355 (diff)
downloadframeworks_av-cbe6fddebe3ec84176037de7f9681d2407fa1113.zip
frameworks_av-cbe6fddebe3ec84176037de7f9681d2407fa1113.tar.gz
frameworks_av-cbe6fddebe3ec84176037de7f9681d2407fa1113.tar.bz2
Merge "Explicitly include Configuration.h"
-rw-r--r--services/audioflinger/AudioFlinger.h1
-rw-r--r--services/audioflinger/StateQueue.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index c1d4c08..d69d6a2 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -18,6 +18,7 @@
#ifndef ANDROID_AUDIO_FLINGER_H
#define ANDROID_AUDIO_FLINGER_H
+#include "Configuration.h"
#include <stdint.h>
#include <sys/types.h>
#include <limits.h>
diff --git a/services/audioflinger/StateQueue.h b/services/audioflinger/StateQueue.h
index 9cde642..9e176c4 100644
--- a/services/audioflinger/StateQueue.h
+++ b/services/audioflinger/StateQueue.h
@@ -89,6 +89,8 @@
// arithmetic on the state pointers. However to the mutator, the state pointers
// are in a definite circular order.
+#include "Configuration.h"
+
namespace android {
#ifdef STATE_QUEUE_DUMP