From 79dc3b032b35e78fc8aff2a7031d0a43844c3774 Mon Sep 17 00:00:00 2001
From: Naseer Ahmed <naseer@codeaurora.org>
Date: Tue, 6 Mar 2018 20:41:14 -0500
Subject: [PATCH] display: Use log.h from VNDK

Change-Id: I8aa8566036a44b1587f5cfe6c745e11a3dd19481
---
 gpu_tonemapper/TonemapFactory.cpp | 2 +-
 gpu_tonemapper/glengine.cpp       | 2 +-
 hdmi_cec/qhdmi_cec.cpp            | 2 +-
 libcopybit/copybit.cpp            | 2 +-
 libcopybit/copybit_c2d.cpp        | 2 +-
 libcopybit/software_converter.cpp | 2 +-
 libgralloc1/gr_adreno_info.cpp    | 2 +-
 libgralloc1/gr_allocator.cpp      | 2 +-
 libgralloc1/gr_device_impl.cpp    | 2 +-
 libgralloc1/gr_ion_alloc.cpp      | 2 +-
 libgralloc1/gr_priv_handle.h      | 2 +-
 liblight/lights.c                 | 2 +-
 libqdutils/profiler.h             | 2 +-
 libqdutils/qdMetaData.cpp         | 2 +-
 libqdutils/qd_utils.h             | 2 +-
 libqservice/IQHDMIClient.cpp      | 2 +-
 libqservice/QService.h            | 2 +-
 sdm/libs/hwc/hwc_debugger.h       | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gpu_tonemapper/TonemapFactory.cpp b/gpu_tonemapper/TonemapFactory.cpp
index 3233682e..db4b8be6 100644
--- a/gpu_tonemapper/TonemapFactory.cpp
+++ b/gpu_tonemapper/TonemapFactory.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "TonemapFactory.h"
-#include <utils/Log.h>
+#include <log/log.h>
 #include "Tonemapper.h"
 #include "engine.h"
 
diff --git a/gpu_tonemapper/glengine.cpp b/gpu_tonemapper/glengine.cpp
index 6c94c23a..35e1932c 100644
--- a/gpu_tonemapper/glengine.cpp
+++ b/gpu_tonemapper/glengine.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "glengine.h"
-#include <utils/Log.h>
+#include <log/log.h>
 #include "engine.h"
 
 void checkGlError(const char *, int);
diff --git a/hdmi_cec/qhdmi_cec.cpp b/hdmi_cec/qhdmi_cec.cpp
index 37c7cd8b..be3ff992 100644
--- a/hdmi_cec/qhdmi_cec.cpp
+++ b/hdmi_cec/qhdmi_cec.cpp
@@ -29,7 +29,7 @@
 
 #define DEBUG 0
 #define ATRACE_TAG (ATRACE_TAG_GRAPHICS | ATRACE_TAG_HAL)
-#include <cutils/log.h>
+#include <log/log.h>
 #include <errno.h>
 #include <hardware/hdmi_cec.h>
 #include <utils/Trace.h>
diff --git a/libcopybit/copybit.cpp b/libcopybit/copybit.cpp
index 80b3cfe6..bd49edc2 100644
--- a/libcopybit/copybit.cpp
+++ b/libcopybit/copybit.cpp
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <linux/msm_mdp.h>
 #include <linux/fb.h>
diff --git a/libcopybit/copybit_c2d.cpp b/libcopybit/copybit_c2d.cpp
index 240ba26c..63c13790 100644
--- a/libcopybit/copybit_c2d.cpp
+++ b/libcopybit/copybit_c2d.cpp
@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <cutils/log.h>
+#include <log/log.h>
 #include <sys/resource.h>
 #include <sys/prctl.h>
 
diff --git a/libcopybit/software_converter.cpp b/libcopybit/software_converter.cpp
index e5c03b57..1aa3ce60 100644
--- a/libcopybit/software_converter.cpp
+++ b/libcopybit/software_converter.cpp
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <stdlib.h>
 #include <errno.h>
 #include "software_converter.h"
diff --git a/libgralloc1/gr_adreno_info.cpp b/libgralloc1/gr_adreno_info.cpp
index 1356abf6..608a2319 100644
--- a/libgralloc1/gr_adreno_info.cpp
+++ b/libgralloc1/gr_adreno_info.cpp
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include <dlfcn.h>
 #include <mutex>
diff --git a/libgralloc1/gr_allocator.cpp b/libgralloc1/gr_allocator.cpp
index ee311f51..330da182 100644
--- a/libgralloc1/gr_allocator.cpp
+++ b/libgralloc1/gr_allocator.cpp
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <algorithm>
 #include <vector>
 
diff --git a/libgralloc1/gr_device_impl.cpp b/libgralloc1/gr_device_impl.cpp
index 4dff8aa3..7a3c16db 100644
--- a/libgralloc1/gr_device_impl.cpp
+++ b/libgralloc1/gr_device_impl.cpp
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <sync/sync.h>
 #include <algorithm>
 #include <sstream>
diff --git a/libgralloc1/gr_ion_alloc.cpp b/libgralloc1/gr_ion_alloc.cpp
index 30d8ae6a..680a516a 100644
--- a/libgralloc1/gr_ion_alloc.cpp
+++ b/libgralloc1/gr_ion_alloc.cpp
@@ -34,7 +34,7 @@
 #include <sys/mman.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <errno.h>
 #include <utils/Trace.h>
 
diff --git a/libgralloc1/gr_priv_handle.h b/libgralloc1/gr_priv_handle.h
index 12fbe1e0..8c4797a1 100644
--- a/libgralloc1/gr_priv_handle.h
+++ b/libgralloc1/gr_priv_handle.h
@@ -21,7 +21,7 @@
 #define __GR_PRIV_HANDLE_H__
 
 #include <errno.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <hardware/gralloc1.h>
 #include <hardware/gralloc.h>
 #ifdef __cplusplus
diff --git a/liblight/lights.c b/liblight/lights.c
index 15db827b..eed6a250 100644
--- a/liblight/lights.c
+++ b/liblight/lights.c
@@ -19,7 +19,7 @@
 
 // #define LOG_NDEBUG 0
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/libqdutils/profiler.h b/libqdutils/profiler.h
index 5f270b02..9ac8157e 100644
--- a/libqdutils/profiler.h
+++ b/libqdutils/profiler.h
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <utils/Singleton.h>
 #include <cutils/properties.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #ifndef DEBUG_CALC_FPS
 #define CALC_FPS() ((void)0)
diff --git a/libqdutils/qdMetaData.cpp b/libqdutils/qdMetaData.cpp
index d9be570a..50a3e6ae 100644
--- a/libqdutils/qdMetaData.cpp
+++ b/libqdutils/qdMetaData.cpp
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/mman.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cinttypes>
 #include <gralloc_priv.h>
 #include "qdMetaData.h"
diff --git a/libqdutils/qd_utils.h b/libqdutils/qd_utils.h
index 9733996f..eed8661f 100644
--- a/libqdutils/qd_utils.h
+++ b/libqdutils/qd_utils.h
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <utils/Errors.h>
-#include <utils/Log.h>
+#include <log/log.h>
 
 #include <linux/fb.h>
 #include <sys/ioctl.h>
diff --git a/libqservice/IQHDMIClient.cpp b/libqservice/IQHDMIClient.cpp
index 9f5044a5..6379e574 100644
--- a/libqservice/IQHDMIClient.cpp
+++ b/libqservice/IQHDMIClient.cpp
@@ -26,7 +26,7 @@
 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include <utils/Log.h>
+#include <log/log.h>
 #include <binder/Parcel.h>
 #include "IQHDMIClient.h"
 
diff --git a/libqservice/QService.h b/libqservice/QService.h
index bd130fa5..6bb4d7d5 100644
--- a/libqservice/QService.h
+++ b/libqservice/QService.h
@@ -32,7 +32,7 @@
 
 #include <utils/Errors.h>
 #include <sys/types.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <binder/IServiceManager.h>
 #include <IQService.h>
 #include <IQClient.h>
diff --git a/sdm/libs/hwc/hwc_debugger.h b/sdm/libs/hwc/hwc_debugger.h
index 50cd14b5..3746a3fc 100644
--- a/sdm/libs/hwc/hwc_debugger.h
+++ b/sdm/libs/hwc/hwc_debugger.h
@@ -34,7 +34,7 @@
 
 #include <core/sdm_types.h>
 #include <core/debug_interface.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <utils/Trace.h>
 #include <bitset>