When enabling Treble, Android builds are complaining about using
cutils/log.h so instead use log/log.h
Cc: Marissa Wall <marissaw@xxxxxxxxxx>
Cc: Sean Paul <seanpaul@xxxxxxxxxx>
Cc: Dmitry Shmidt <dimitrysh@xxxxxxxxxx>
Cc: Robert Foss <robert.foss@xxxxxxxxxxxxx>
Cc: Matt Szczesiak <matt.szczesiak@xxxxxxx>
Cc: Liviu Dudau <Liviu.Dudau@xxxxxxx>
Cc: David Hanna <david.hanna11@xxxxxxxxx>
Cc: Rob Herring <rob.herring@xxxxxxxxxx>
Cc: Alexandru-Cosmin Gheorghe <Alexandru-Cosmin.Gheorghe@xxxxxxx>
Cc: Alistair Strachan <astrachan@xxxxxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
---
autolock.cpp | 2 +-
drmcompositorworker.cpp | 2 +-
drmconnector.cpp | 2 +-
drmcrtc.cpp | 2 +-
drmdisplaycomposition.cpp | 2 +-
drmdisplaycompositor.cpp | 2 +-
drmeventlistener.cpp | 2 +-
drmhwctwo.cpp | 2 +-
drmplane.cpp | 2 +-
drmresources.cpp | 2 +-
hwcomposer.cpp | 2 +-
hwcutils.cpp | 2 +-
platform.cpp | 2 +-
platformdrmgeneric.cpp | 2 +-
platformhisi.cpp | 2 +-
virtualcompositorworker.cpp | 2 +-
vsyncworker.cpp | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/autolock.cpp b/autolock.cpp
index 1a2ded7..795a8c2 100644
--- a/autolock.cpp
+++ b/autolock.cpp
@@ -22,7 +22,7 @@
#include <errno.h>
#include <pthread.h>
-#include <cutils/log.h>
+#include <log/log.h>
namespace android {
diff --git a/drmcompositorworker.cpp b/drmcompositorworker.cpp
index a4e7fc9..695876d 100644
--- a/drmcompositorworker.cpp
+++ b/drmcompositorworker.cpp
@@ -22,7 +22,7 @@
#include <stdlib.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <hardware/hardware.h>
namespace android {
diff --git a/drmconnector.cpp b/drmconnector.cpp
index 145518f..10b96b5 100644
--- a/drmconnector.cpp
+++ b/drmconnector.cpp
@@ -22,7 +22,7 @@
#include <errno.h>
#include <stdint.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <xf86drmMode.h>
namespace android {
diff --git a/drmcrtc.cpp b/drmcrtc.cpp
index 1b354fe..4033269 100644
--- a/drmcrtc.cpp
+++ b/drmcrtc.cpp
@@ -22,7 +22,7 @@
#include <stdint.h>
#include <xf86drmMode.h>
-#include <cutils/log.h>
+#include <log/log.h>
namespace android {
diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index 66e67a4..24a8e9c 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -28,7 +28,7 @@
#include <algorithm>
#include <unordered_set>
-#include <cutils/log.h>
+#include <log/log.h>
#include <sw_sync.h>
#include <sync/sync.h>
#include <xf86drmMode.h>
diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index e556e86..e570923 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -26,7 +26,7 @@
#include <sstream>
#include <vector>
-#include <cutils/log.h>
+#include <log/log.h>
#include <drm/drm_mode.h>
#include <sync/sync.h>
#include <utils/Trace.h>
diff --git a/drmeventlistener.cpp b/drmeventlistener.cpp
index 5534182..9cdff81 100644
--- a/drmeventlistener.cpp
+++ b/drmeventlistener.cpp
@@ -24,7 +24,7 @@
#include <linux/netlink.h>
#include <sys/socket.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <hardware/hardware.h>
#include <hardware/hwcomposer.h>
#include <xf86drm.h>
diff --git a/drmhwctwo.cpp b/drmhwctwo.cpp
index dfca1a6..8e00d71 100644
--- a/drmhwctwo.cpp
+++ b/drmhwctwo.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include <string>
-#include <cutils/log.h>
+#include <log/log.h>
#include <cutils/properties.h>
#include <hardware/hardware.h>
#include <hardware/hwcomposer2.h>
diff --git a/drmplane.cpp b/drmplane.cpp
index 1f739ae..4449256 100644
--- a/drmplane.cpp
+++ b/drmplane.cpp
@@ -23,7 +23,7 @@
#include <errno.h>
#include <stdint.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <xf86drmMode.h>
namespace android {
diff --git a/drmresources.cpp b/drmresources.cpp
index 32dd376..ec6664c 100644
--- a/drmresources.cpp
+++ b/drmresources.cpp
@@ -30,7 +30,7 @@
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <cutils/properties.h>
namespace android {
diff --git a/hwcomposer.cpp b/hwcomposer.cpp
index c0aafef..338e042 100644
--- a/hwcomposer.cpp
+++ b/hwcomposer.cpp
@@ -39,7 +39,7 @@
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <cutils/properties.h>
#include <hardware/hardware.h>
#include <hardware/hwcomposer.h>
diff --git a/hwcutils.cpp b/hwcutils.cpp
index 53a7d82..715c93e 100644
--- a/hwcutils.cpp
+++ b/hwcutils.cpp
@@ -20,7 +20,7 @@
#include "drmhwcomposer.h"
#include "platform.h"
-#include <cutils/log.h>
+#include <log/log.h>
namespace android {
diff --git a/platform.cpp b/platform.cpp
index 56ab37e..62b03a8 100644
--- a/platform.cpp
+++ b/platform.cpp
@@ -19,7 +19,7 @@
#include "drmresources.h"
#include "platform.h"
-#include <cutils/log.h>
+#include <log/log.h>
namespace android {
diff --git a/platformdrmgeneric.cpp b/platformdrmgeneric.cpp
index 2a6773c..8253967 100644
--- a/platformdrmgeneric.cpp
+++ b/platformdrmgeneric.cpp
@@ -24,7 +24,7 @@
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <gralloc_handle.h>
#include <hardware/gralloc.h>
#include <EGL/eglext.h>
diff --git a/platformhisi.cpp b/platformhisi.cpp
index 16c5e6f..3f5c319 100644
--- a/platformhisi.cpp
+++ b/platformhisi.cpp
@@ -27,7 +27,7 @@
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <hardware/gralloc.h>
#include "gralloc_priv.h"
diff --git a/virtualcompositorworker.cpp b/virtualcompositorworker.cpp
index 639dc86..b64b414 100644
--- a/virtualcompositorworker.cpp
+++ b/virtualcompositorworker.cpp
@@ -22,7 +22,7 @@
#include <errno.h>
#include <stdlib.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <hardware/hardware.h>
#include <hardware/hwcomposer.h>
#include <sched.h>
diff --git a/vsyncworker.cpp b/vsyncworker.cpp
index 3bfe4be..d431d2e 100644
--- a/vsyncworker.cpp
+++ b/vsyncworker.cpp
@@ -26,7 +26,7 @@
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <hardware/hardware.h>
namespace android {
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
