Fix build for AOSP/L

BZ: 209178

Change-Id: Ie613d65660cf3c403f6eb31120ac21f27efdb63e
Signed-off-by: Thierry Strudel <thierry.strudel@intel.com>
Reviewed-on: https://android.intel.com/218248
Reviewed-by: Imberton, Guilhem <guilhem.imberton@intel.com>
Tested-by: Imberton, Guilhem <guilhem.imberton@intel.com>
diff --git a/asfparser/AsfDataParser.cpp b/asfparser/AsfDataParser.cpp
index 03e474d..b9c07bc 100644
--- a/asfparser/AsfDataParser.cpp
+++ b/asfparser/AsfDataParser.cpp
@@ -30,7 +30,7 @@
 #include "AsfGuids.h"
 #include "AsfObjects.h"
 #include <string.h>
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 #include "AsfHeaderParser.h"
 
 AsfHeaderParser *AsfDataParser::mHeaderParser = NULL;
diff --git a/asfparser/AsfHeaderParser.cpp b/asfparser/AsfHeaderParser.cpp
index 4887a53..e10b79e 100644
--- a/asfparser/AsfHeaderParser.cpp
+++ b/asfparser/AsfHeaderParser.cpp
@@ -26,7 +26,7 @@
 
 //#define LOG_NDEBUG 0
 #define LOG_TAG "AsfHeaderParser"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 
 #include "AsfHeaderParser.h"
 #include <string.h>
diff --git a/imagedecoder/ImageDecoderTrace.h b/imagedecoder/ImageDecoderTrace.h
index a3dadc0..68fdbfe 100644
--- a/imagedecoder/ImageDecoderTrace.h
+++ b/imagedecoder/ImageDecoderTrace.h
@@ -56,7 +56,7 @@
 #define LOG_NDEBUG 0
 
 
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 #define ETRACE(...) ALOGE(__VA_ARGS__)
 #define WTRACE(...) ALOGW(__VA_ARGS__)
 #define ITRACE(...) ALOGI(__VA_ARGS__)
diff --git a/imagedecoder/JPEGDecoder_libjpeg_wrapper.cpp b/imagedecoder/JPEGDecoder_libjpeg_wrapper.cpp
index 0e123e5..a982c15 100644
--- a/imagedecoder/JPEGDecoder_libjpeg_wrapper.cpp
+++ b/imagedecoder/JPEGDecoder_libjpeg_wrapper.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 #include "JPEGDecoder_libjpeg_wrapper.h"
 #include <hardware/gralloc.h>
 #include <utils/threads.h>
diff --git a/imageencoder/ImageEncoder.cpp b/imageencoder/ImageEncoder.cpp
index ec89fc6..5605019 100644
--- a/imageencoder/ImageEncoder.cpp
+++ b/imageencoder/ImageEncoder.cpp
@@ -1,7 +1,7 @@
 /*#define LOG_NDEBUG 0*/
 #define LOG_TAG "IntelImageEncoder"
 
-#include <cutils/log.h>
+#include <wrs_omxil_core/log.h>
 #include "ImageEncoder.h"
 
 IntelImageEncoder::IntelImageEncoder(void)
diff --git a/mix_vbp/viddec_fw/fw/codecs/vp8/parser/viddec_vp8_parse.c b/mix_vbp/viddec_fw/fw/codecs/vp8/parser/viddec_vp8_parse.c
index b5dfbe6..6f490f6 100644
--- a/mix_vbp/viddec_fw/fw/codecs/vp8/parser/viddec_vp8_parse.c
+++ b/mix_vbp/viddec_fw/fw/codecs/vp8/parser/viddec_vp8_parse.c
@@ -29,7 +29,7 @@
 #include "viddec_fw_workload.h"
 #include "viddec_pm.h"
 
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 #include "vp8.h"
 #include "vp8parse.h"
 #include "viddec_vp8_parse.h"
diff --git a/mix_vbp/viddec_fw/fw/parser/vbp_trace.h b/mix_vbp/viddec_fw/fw/parser/vbp_trace.h
index ba916b9..dd06659 100644
--- a/mix_vbp/viddec_fw/fw/parser/vbp_trace.h
+++ b/mix_vbp/viddec_fw/fw/parser/vbp_trace.h
@@ -41,7 +41,7 @@
 
 #define LOG_TAG "MixVBP"
 
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 #define ETRACE(...) LOGE(__VA_ARGS__)
 #define WTRACE(...) LOGW(__VA_ARGS__)
 #define ITRACE(...) LOGI(__VA_ARGS__)
diff --git a/mixvbp/include/vbp_trace.h b/mixvbp/include/vbp_trace.h
index ba916b9..dd06659 100755
--- a/mixvbp/include/vbp_trace.h
+++ b/mixvbp/include/vbp_trace.h
@@ -41,7 +41,7 @@
 
 #define LOG_TAG "MixVBP"
 
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 #define ETRACE(...) LOGE(__VA_ARGS__)
 #define WTRACE(...) LOGW(__VA_ARGS__)
 #define ITRACE(...) LOGI(__VA_ARGS__)
diff --git a/mixvbp/vbp_plugin/vp8/viddec_vp8_parse.c b/mixvbp/vbp_plugin/vp8/viddec_vp8_parse.c
index 860adc0..8226732 100755
--- a/mixvbp/vbp_plugin/vp8/viddec_vp8_parse.c
+++ b/mixvbp/vbp_plugin/vp8/viddec_vp8_parse.c
@@ -27,7 +27,7 @@
 
 #include "viddec_pm.h"
 
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 #include "vp8.h"
 #include "vp8parse.h"
 
diff --git a/test/mix_decoder.cpp b/test/mix_decoder.cpp
index ab82747..c686d56 100755
--- a/test/mix_decoder.cpp
+++ b/test/mix_decoder.cpp
@@ -1,7 +1,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "mix_decoder"
 #include <VideoDecoderHost.h>
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 #include <vbp_loader.h>
 #include <va/va.h>
 #include <stdlib.h>
diff --git a/videodecoder/VideoDecoderTrace.h b/videodecoder/VideoDecoderTrace.h
index c8b7dce..1ca7d12 100755
--- a/videodecoder/VideoDecoderTrace.h
+++ b/videodecoder/VideoDecoderTrace.h
@@ -54,7 +54,7 @@
 
 #define LOG_TAG "VideoDecoder"
 
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 #define ETRACE(...) LOGE(__VA_ARGS__)
 #define WTRACE(...) LOGW(__VA_ARGS__)
 #define ITRACE(...) LOGI(__VA_ARGS__)
diff --git a/videoencoder/IntelMetadataBuffer.cpp b/videoencoder/IntelMetadataBuffer.cpp
index 1cb2e39..79c3801 100644
--- a/videoencoder/IntelMetadataBuffer.cpp
+++ b/videoencoder/IntelMetadataBuffer.cpp
@@ -24,7 +24,7 @@
 
 //#define LOG_NDEBUG 0
 #define LOG_TAG "IntelMetadataBuffer"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 
 #include "IntelMetadataBuffer.h"
 #include <string.h>
@@ -240,7 +240,7 @@
     sp<IBinder> binder = sm->checkService(String16("media.IntelBufferSharing"));
 
     if (binder == 0)
-        LOGE("media.IntelBufferSharing service is not published");
+        ALOGE("media.IntelBufferSharing service is not published");
 
     return binder;
 }
@@ -272,7 +272,7 @@
 
             if (pid == getpid()) //in same process, should not use binder
             {
-                LOGE("onTransact in same process, wrong sessionflag?");
+                ALOGE("onTransact in same process, wrong sessionflag?");
                 return UNKNOWN_ERROR;
             }
 
@@ -296,7 +296,7 @@
             if (pid == getpid()) //in same process, should not use binder
             {
                 //same process, return same pointer in data
-                LOGE("onTransact CLEAR_MEM in same process, wrong sessionflag?");
+                ALOGE("onTransact CLEAR_MEM in same process, wrong sessionflag?");
                 return UNKNOWN_ERROR;
             }
 
@@ -308,7 +308,7 @@
 
             if (pid == getpid()) //in same process, should not use binder
             {
-                LOGE("onTransact GET_MEM in same process, wrong sessionflag?");
+                ALOGE("onTransact GET_MEM in same process, wrong sessionflag?");
                 return UNKNOWN_ERROR;
             }
 
@@ -320,7 +320,7 @@
             if (smem && (NO_ERROR == WriteMemObjToBinder(*reply, smem)))
                 return NO_ERROR;
             else
-                LOGE("onTransact GET_MEM: Not find mem");
+                ALOGE("onTransact GET_MEM: Not find mem");
 
             return UNKNOWN_ERROR;
         }
diff --git a/videoencoder/PVSoftMPEG4Encoder.cpp b/videoencoder/PVSoftMPEG4Encoder.cpp
index 9a8d234..b599847 100644
--- a/videoencoder/PVSoftMPEG4Encoder.cpp
+++ b/videoencoder/PVSoftMPEG4Encoder.cpp
@@ -39,7 +39,7 @@
 
 //#define LOG_NDEBUG 0
 #define LOG_TAG "PVSoftMPEG4Encoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
 
 #include "mp4enc_api.h"
 #include "OMX_Video.h"
diff --git a/videoencoder/VideoEncoderHost.cpp b/videoencoder/VideoEncoderHost.cpp
index 39b0e5d..9483eb6 100644
--- a/videoencoder/VideoEncoderHost.cpp
+++ b/videoencoder/VideoEncoderHost.cpp
@@ -16,7 +16,7 @@
 #include "VideoEncoderHost.h"
 #include <string.h>
 #include <cutils/properties.h>
-#include <cutils/log.h>
+#include <wrs_omxil_core/log.h>
 
 int32_t gLogLevel = 0;
 
diff --git a/videoencoder/VideoEncoderLog.h b/videoencoder/VideoEncoderLog.h
index 74760fe..320e495 100644
--- a/videoencoder/VideoEncoderLog.h
+++ b/videoencoder/VideoEncoderLog.h
@@ -11,20 +11,13 @@
 
 #define LOG_TAG "VideoEncoder"
 
-// Components
-#include <cutils/log.h>
+#include <wrs_omxil_core/log.h>
 
-#if 1
-#define LOG_V(...) LOGV_IF(gLogLevel, __VA_ARGS__)
-#define LOG_I(...) LOGI_IF(gLogLevel, __VA_ARGS__)
-#define LOG_W(...) LOGW_IF(gLogLevel, __VA_ARGS__)
-#define LOG_E(...) LOGE_IF(gLogLevel, __VA_ARGS__)
-#else
-#define LOG_V printf
-#define LOG_I printf
-#define LOG_W printf
-#define LOG_E printf
-#endif
+#define LOG_V ALOGV
+#define LOG_D ALOGD
+#define LOG_I ALOGI
+#define LOG_W ALOGW
+#define LOG_E ALOGE
 
 extern int32_t gLogLevel;
 #define CHECK_VA_STATUS_RETURN(FUNC)\