drm_hwcomposer: Move importer.h to platform.h

We're going to need more platform-specific stuff, so lump it
all in the same header.

BUG=b/28117135
TEST=compiles

Change-Id: Idfe82e9a29a0bcd284a02b2e58af0e620fdc542b
Signed-off-by: Sean Paul <seanpaul@chromium.org>

diff --git a/drmcomposition.h b/drmcomposition.h
index bff885e..ccb7184 100644 (file)
--- a/drmcomposition.h
+++ b/drmcomposition.h
@@ -20,7 +20,7 @@
 #include "drmhwcomposer.h"
 #include "drmdisplaycomposition.h"
 #include "drmplane.h"
-#include "importer.h"
+#include "platform.h"
 
 #include <map>
 #include <vector>

diff --git a/drmcompositor.h b/drmcompositor.h
index fd057c0..27623d9 100644 (file)
--- a/drmcompositor.h
+++ b/drmcompositor.h
@@ -19,7 +19,7 @@
 
 #include "drmcomposition.h"
 #include "drmdisplaycompositor.h"
-#include "importer.h"
+#include "platform.h"
 
 #include <map>
 #include <memory>

diff --git a/drmdisplaycomposition.h b/drmdisplaycomposition.h
index 3ab934d..264963c 100644 (file)
--- a/drmdisplaycomposition.h
+++ b/drmdisplaycomposition.h
@@ -21,7 +21,7 @@
 #include "drmhwcomposer.h"
 #include "drmplane.h"
 #include "glworker.h"
-#include "importer.h"
+#include "platform.h"
 
 #include <sstream>
 #include <vector>

diff --git a/drmgenericimporter.cpp b/drmgenericimporter.cpp
index f81ea9b..24af138 100644 (file)
--- a/drmgenericimporter.cpp
+++ b/drmgenericimporter.cpp
@@ -16,9 +16,9 @@
 
 #define LOG_TAG "hwc-drm-generic-importer"
 
-#include "importer.h"
 #include "drmresources.h"
 #include "drmgenericimporter.h"
+#include "platform.h"
 
 #include <drm/drm_fourcc.h>
 #include <xf86drm.h>

diff --git a/drmgenericimporter.h b/drmgenericimporter.h
index c362c17..8ea950c 100644 (file)
--- a/drmgenericimporter.h
+++ b/drmgenericimporter.h
@@ -18,7 +18,7 @@
 #define ANDROID_DRM_GENERIC_IMPORTER_H_
 
 #include "drmresources.h"
-#include "importer.h"
+#include "platform.h"
 
 #include <hardware/gralloc.h>
 

diff --git a/hwcomposer.cpp b/hwcomposer.cpp
index a81d6cc..b2e9643 100644 (file)
--- a/hwcomposer.cpp
+++ b/hwcomposer.cpp
@@ -20,7 +20,7 @@
 #include "drmhwcomposer.h"
 #include "drmeventlistener.h"
 #include "drmresources.h"
-#include "importer.h"
+#include "platform.h"
 #include "virtualcompositorworker.h"
 #include "vsyncworker.h"
 

diff --git a/nvimporter.cpp b/nvimporter.cpp
index febcb4f..acf56ee 100644 (file)
--- a/nvimporter.cpp
+++ b/nvimporter.cpp
@@ -17,7 +17,7 @@
 #define LOG_TAG "hwc-nv-importer"
 
 #include "drmresources.h"
-#include "importer.h"
+#include "platform.h"
 #include "nvimporter.h"
 
 #include <cinttypes>

diff --git a/nvimporter.h b/nvimporter.h
index d6033db..6c7f80a 100644 (file)
--- a/nvimporter.h
+++ b/nvimporter.h
@@ -18,7 +18,7 @@
 #define ANDROID_NV_IMPORTER_H_
 
 #include "drmresources.h"
-#include "importer.h"
+#include "platform.h"
 
 #include <stdatomic.h>
 

diff --git a/importer.h b/platform.h
similarity index 100%
rename from importer.h
rename to platform.h