| commit | d53d7a126d6a87728b50e7645094278ba8645ce9 | [log] [tgz] |
|---|---|---|
| author | Zim <zezeozue@google.com> | Thu Aug 25 13:54:47 2022 +0100 |
| committer | Zimuzo Ezeozue <zezeozue@google.com> | Fri Aug 26 08:38:23 2022 +0000 |
| tree | 9c401fc07a6c681c75dcff49b91911c4a1d06872 | |
| parent | 1bd824f94680d66b51e284f9ec65cbbee597d6b8 [diff] [blame] |
#undef ATRACE_TAG to fix compile error aidl tag tracing was enabled by default for cpp backends: aosp/2190022. This defines ATRACE_TAG in some of the include files. To fix compile error '-Wmacro-redefined', #undef ATRACE_TAG and redefine Test: m Bug: 161393989 Change-Id: Ib12e375ec29151d25474cca147dd4d21d127ee84
diff --git a/media/libaaudio/src/client/AudioStreamInternalCapture.cpp b/media/libaaudio/src/client/AudioStreamInternalCapture.cpp index 1efccb1..f5cc2be 100644 --- a/media/libaaudio/src/client/AudioStreamInternalCapture.cpp +++ b/media/libaaudio/src/client/AudioStreamInternalCapture.cpp
@@ -25,6 +25,7 @@ #include "client/AudioStreamInternalCapture.h" #include "utility/AudioClock.h" +#undef ATRACE_TAG #define ATRACE_TAG ATRACE_TAG_AUDIO #include <utils/Trace.h>