Merge "Include what you use" into oc-dev

2 files changed, 4 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index f093c56c..1a28421d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9,6 +9,7 @@ cc_library_shared {
         "liblog",
         "libdl",
     ],
+    header_libs: ["libsystem_headers"],
     cflags: ["-DQEMU_HARDWARE"],
 }
 
diff --git a/hardware.c b/hardware.c
index 5394787e..7e4debec 100644
--- a/hardware.c
+++ b/hardware.c
@@ -23,9 +23,11 @@
 #include <pthread.h>
 #include <errno.h>
 #include <limits.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #define LOG_TAG "HAL"
-#include <utils/Log.h>
+#include <log/log.h>
 
 /** Base path of the hal modules */
 #if defined(__LP64__)