commit ce379929878b5dc61f2d243e84e83b7532fb9d1e
author Jakub Pawlowski <jpawlowski@google.com> Wed Oct 19 19:33:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 19 19:33:16 2016 +0000
tree d6ae9047227268f72db3dd41f7055c0c8566b8b2
parent 2efccdc315d49f5ca50d8292e43522c2c0db1041
parent 3f4f1c39dd665522b6af9c8566733bd726e081d0

Merge "Get rid of dependency on core from linux build (2/2)" am: 77a4c05a7e am: 3ed4100144
am: 3f4f1c39dd

Change-Id: I929a3a58a569ca14c1be0c3ee7e534db9008f5d7

include/hardware/hardware.h

diff --git a/include/hardware/hardware.h b/include/hardware/hardware.h
index bf076f6..5ba37e9 100644
--- a/include/hardware/hardware.h
+++ b/include/hardware/hardware.h
@@ -20,8 +20,10 @@
 #include <stdint.h>
 #include <sys/cdefs.h>
 
+#ifndef _HW_DONT_INCLUDE_CORE_
 #include <cutils/native_handle.h>
 #include <system/graphics.h>
+#endif // _HW_DONT_INCLUDE_CORE_
 
 __BEGIN_DECLS