summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2017-01-11 15:35:19 +0000
committer android-build-merger <android-build-merger@google.com> 2017-01-11 15:35:19 +0000
commit6143cbf1e5ab5e879044748c497e05b36ad4c36a (patch)
tree62a7d1241350375d30d083dca32529e99c480648 /libs/input/PointerController.cpp
parent5be9960f664979b9acea972ddf114eaacb8acb58 (diff)
parente7fcbcb9919e8f1c0fc5935b8a6aeb0b0dec9700 (diff)
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
am: e7fcbcb991 Change-Id: I13ddcd1826ce3df02a6c95875b9fa981c238ca08
Diffstat (limited to 'libs/input/PointerController.cpp')
-rw-r--r--libs/input/PointerController.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp
index abef66f9ecd9..07bcbd35819d 100644
--- a/libs/input/PointerController.cpp
+++ b/libs/input/PointerController.cpp
@@ -15,7 +15,6 @@
*/
#define LOG_TAG "PointerController"
-
//#define LOG_NDEBUG 0
// Log debug messages about pointer updates
@@ -23,8 +22,9 @@
#include "PointerController.h"
-#include <cutils/log.h>
+#include <log/log.h>
+// ToDo: Fix code to be warning free
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <SkBitmap.h>