Permalink
Browse files

Move all android headers into a android/ subdirectory for clear separ…

…ation

Signed-off-by: Simon Busch <morphis@gravedo.de>
  • Loading branch information...
1 parent 3187ce4 commit fdb26d600ed0c43f32e66e626b442ffdd75db6d6 @morphis committed Mar 22, 2013
View
@@ -2,7 +2,7 @@
#define FBDEV_WINDOW_H
#include "nativewindowbase.h"
#include <linux/fb.h>
-#include <hardware/gralloc.h>
+#include <android/hardware/gralloc.h>
#define FRAMEBUFFER_PARTITIONS 2
class FbDevNativeWindowBuffer : public BaseNativeWindowBuffer
View
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include <cutils/native_handle.h>
+#include <android/cutils/native_handle.h>
native_handle_t* native_handle_create(int numFds, int numInts)
{
View
@@ -1,5 +1,5 @@
-#include <system/window.h>
-#include <hardware/gralloc.h>
+#include <android/system/window.h>
+#include <android/hardware/gralloc.h>
#include "support.h"
#include <stdarg.h>
View
@@ -1,7 +1,7 @@
#ifndef NATIVEWINDOWBASE_H
#define NATIVEWINDOWBASE_H
-#include <system/window.h>
+#include <android/system/window.h>
#include <EGL/egl.h>
#define NO_ERROR 0L
View
@@ -22,7 +22,7 @@
#include <sys/mman.h> //mmap, munmap
#include <errno.h>
-#include <hardware/gralloc.h>
+#include <android/hardware/gralloc.h>
#include "nativewindowbase.h"
#include "offscreen_window.h"
View
@@ -2,7 +2,7 @@
#define OFFSCREEN_WINDOW_H
#include <linux/fb.h>
-#include <hardware/gralloc.h>
+#include <android/hardware/gralloc.h>
#include "nativewindowbase.h"
View
@@ -39,19 +39,19 @@ vginclude_HEADERS = \
VG/vgplatform.h \
VG/vgu.h
-cutilsincludedir = $(includedir)/cutils
+cutilsincludedir = $(includedir)/android/cutils
cutilsinclude_HEADERS = \
- cutils/native_handle.h
+ android/cutils/native_handle.h
-systemincludedir = $(includedir)/system
+systemincludedir = $(includedir)/android/system
systeminclude_HEADERS = \
- system/window.h \
- system/graphics.h
+ android/system/window.h \
+ android/system/graphics.h
-hardwareincludedir = $(includedir)/hardware
+hardwareincludedir = $(includedir)/android/hardware
hardwareinclude_HEADERS = \
- hardware/fb.h \
- hardware/gralloc.h \
- hardware/hardware.h \
- hardware/sensors.h \
- hardware/lights.h
+ android/hardware/fb.h \
+ android/hardware/gralloc.h \
+ android/hardware/hardware.h \
+ android/hardware/sensors.h \
+ android/hardware/lights.h
@@ -22,9 +22,8 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#include <cutils/native_handle.h>
-
-#include <hardware/hardware.h>
+#include <android/cutils/native_handle.h>
+#include <android/hardware/hardware.h>
__BEGIN_DECLS
@@ -18,17 +18,17 @@
#ifndef ANDROID_GRALLOC_INTERFACE_H
#define ANDROID_GRALLOC_INTERFACE_H
-#include <system/window.h>
-#include <hardware/hardware.h>
+#include <android/system/window.h>
+#include <android/hardware/hardware.h>
#include <stdint.h>
#include <sys/cdefs.h>
#include <sys/types.h>
-#include <cutils/native_handle.h>
+#include <android/cutils/native_handle.h>
-#include <hardware/hardware.h>
-#include <hardware/fb.h>
+#include <android/hardware/hardware.h>
+#include <android/hardware/fb.h>
__BEGIN_DECLS
@@ -20,8 +20,8 @@
#include <stdint.h>
#include <sys/cdefs.h>
-#include <cutils/native_handle.h>
-#include <system/graphics.h>
+#include <android/cutils/native_handle.h>
+#include <android/system/graphics.h>
__BEGIN_DECLS
@@ -21,7 +21,7 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#include <hardware/hardware.h>
+#include <android/hardware/hardware.h>
__BEGIN_DECLS
@@ -21,8 +21,8 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#include <hardware/hardware.h>
-#include <cutils/native_handle.h>
+#include <android/hardware/hardware.h>
+#include <android/cutils/native_handle.h>
__BEGIN_DECLS
File renamed without changes.
@@ -22,8 +22,8 @@
#include <string.h>
#include <sys/cdefs.h>
-#include <system/graphics.h>
-#include <cutils/native_handle.h>
+#include <android/system/graphics.h>
+#include <android/cutils/native_handle.h>
__BEGIN_DECLS
View
@@ -18,7 +18,7 @@
#include <memory.h>
#include <assert.h>
#include <stdio.h>
-#include <hardware/lights.h>
+#include <android/hardware/lights.h>
int main(int argc, char **argv)
{
View
@@ -17,7 +17,7 @@
#include <assert.h>
#include <stdio.h>
-#include <hardware/sensors.h>
+#include <android/hardware/sensors.h>
int main(int argc, char **argv)
{

0 comments on commit fdb26d6

Please sign in to comment.