diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2017-02-21 20:58:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-21 20:58:55 +0000 |
| commit | 30fa0b87e9b0306cdd59e6c5d3e8ff5cab56d026 (patch) | |
| tree | 6f72729e0640e5b1f5f7260aa57d9ea9f7be18ef | |
| parent | dfc913249657ddb9b10369bcf503d0b151b9afa6 (diff) | |
| parent | f4bd5f6bd44b7896d25e8a00b9f312ec2c6a54b1 (diff) | |
| download | fdk-aac-30fa0b87e9b0306cdd59e6c5d3e8ff5cab56d026.tar.gz fdk-aac-30fa0b87e9b0306cdd59e6c5d3e8ff5cab56d026.tar.bz2 fdk-aac-30fa0b87e9b0306cdd59e6c5d3e8ff5cab56d026.zip | |
Merge "Linux compilation fix" am: b82c85d0b1 am: 7c8dd3bb93
am: f4bd5f6bd4
Change-Id: I4f054be1c1342296c69748c2e616b07c7bd9401c
| -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; } |