diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-11-14 13:33:34 -0800 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2014-11-14 13:33:34 -0800 |
| commit | c84d9d235679a4d48245b316b7b2e4c0b19413e7 (patch) | |
| tree | 7d99052ecb2f3686a3a70b16fa9fc554eefbbecb /services/audiopolicy/AudioPolicyService.h | |
| parent | a82b5f575d0b7f9465cd879be04929fefd4cc5c5 (diff) | |
| download | frameworks_av-c84d9d235679a4d48245b316b7b2e4c0b19413e7.zip frameworks_av-c84d9d235679a4d48245b316b7b2e4c0b19413e7.tar.gz frameworks_av-c84d9d235679a4d48245b316b7b2e4c0b19413e7.tar.bz2 | |
Include AudioPolicyInterface.h only when needed.
Both legacy and non-legacy AudioPolicyInterface define
extern "C" functions createAudioPloicyManager and
destroyAudioPloicyManager. Standard C++ does not
allow overloading of extern C functions.
g++ did not catch this problem but clang++ does.
Change-Id: I80869cdb26e7721777e53d4eff71c5c733044abf
Diffstat (limited to 'services/audiopolicy/AudioPolicyService.h')
| -rw-r--r-- | services/audiopolicy/AudioPolicyService.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/audiopolicy/AudioPolicyService.h b/services/audiopolicy/AudioPolicyService.h index 4e68ab1..a09c084 100644 --- a/services/audiopolicy/AudioPolicyService.h +++ b/services/audiopolicy/AudioPolicyService.h @@ -30,7 +30,9 @@ #include <media/IAudioPolicyService.h> #include <media/ToneGenerator.h> #include <media/AudioEffect.h> +#ifdef USE_LEGACY_AUDIO_POLICY #include <hardware_legacy/AudioPolicyInterface.h> +#endif #include "AudioPolicyEffects.h" #include "AudioPolicyManager.h" |