commit f4bd5f6bd44b7896d25e8a00b9f312ec2c6a54b1
author Jakub Pawlowski <jpawlowski@google.com> Tue Feb 21 20:56:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 21 20:56:55 2017 +0000
tree e7e4b9fdb98deef22a30ee6acac90c6a11cf7f3b
parent 4910e5a3520d92c4e6d37bfabc833771e7f02243
parent 7c8dd3bb9302987a502fbd26b4ef5884315d638a

Merge "Linux compilation fix" am: b82c85d0b1
am: 7c8dd3bb93

Change-Id: Ifba0bf717a42c3889ea686d1f46cd0758e61851e

libPCMutils/src/pcmutils_lib.cpp

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 @@
                 expansion in the PCM time domain.
 
 *******************************************************************************/
+#ifndef __linux__
 #include <log/log.h>
+#endif
 #include "pcmutils_lib.h"
 
 #include "genericStds.h"
@@ -2079,7 +2081,9 @@
         }
       }
       if (ch != numInChannels) {
+#ifndef __linux__
           ALOGE("b/23876444");
+#endif
           return PCMDMX_INVALID_ARGUMENT;
       }