| commit | 3b8af70d026e8a4ef7f73ecaef45e07a02c974b7 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@android.com> | Wed Jul 01 16:22:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 01 16:22:58 2020 +0000 |
| tree | 00b9c60616f6827bc7ef90d6a0bd169b86f99665 | |
| parent | dd80e302d094e4f4660a17ccbe22eef5546fcf78 [diff] | |
| parent | 2f13acc6b50114aa585d64e8bf9873813640cd7c [diff] |
Merge "Include what you use: <cutils/bitops.h> for popcount" am: 48ac45e0e8 am: 8beb417636 am: 2d970888a3 am: 2f13acc6b5 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1353586 Change-Id: I76bfbf1f69d570d20ef1c6b7c1096489b277e468
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index 3eacc8c..bf2e953 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp
@@ -40,6 +40,7 @@ #include <audio_utils/channels.h> #include <audio_utils/format.h> #include <audio_utils/mono_blend.h> +#include <cutils/bitops.h> #include <media/AudioMixer.h> #include "FastMixer.h" #include "TypedLogger.h"
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index f002196..b90eda8 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp
@@ -29,6 +29,7 @@ #include <linux/futex.h> #include <sys/stat.h> #include <sys/syscall.h> +#include <cutils/bitops.h> #include <cutils/properties.h> #include <media/AudioContainers.h> #include <media/AudioDeviceTypeAddr.h>