diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-02-21 20:48:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-21 20:48:23 +0000 |
| commit | b82c85d0b1ee364ca20e2e9222ea4b6b39d917d3 (patch) | |
| tree | e7e4b9fdb98deef22a30ee6acac90c6a11cf7f3b | |
| parent | 8334e4b410f78a36ec8073f1ff788ab911335654 (diff) | |
| parent | 2cd9fe39642bf3a4b8ef36ccff307a3e24bdb196 (diff) | |
| download | fdk-aac-b82c85d0b1ee364ca20e2e9222ea4b6b39d917d3.tar.gz fdk-aac-b82c85d0b1ee364ca20e2e9222ea4b6b39d917d3.tar.bz2 fdk-aac-b82c85d0b1ee364ca20e2e9222ea4b6b39d917d3.zip | |
Merge "Linux compilation fix"
| -rw-r--r-- | libPCMutils/src/pcmutils_lib.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libPCMutils/src/pcmutils_lib.cpp b/libPCMutils/src/pcmutils_lib.cpp index e6ac3ff..9303d16 100644 --- a/libPCMutils/src/pcmutils_lib.cpp +++ b/libPCMutils/src/pcmutils_lib.cpp @@ -88,7 +88,9 @@ amm-info@iis.fraunhofer.de expansion in the PCM time domain. *******************************************************************************/ +#ifndef __linux__ #include <log/log.h> +#endif #include "pcmutils_lib.h" #include "genericStds.h" @@ -2079,7 +2081,9 @@ PCMDMX_ERROR pcmDmx_ApplyFrame ( } } if (ch != numInChannels) { +#ifndef __linux__ ALOGE("b/23876444"); +#endif return PCMDMX_INVALID_ARGUMENT; } |