diff options
| author | Sean Paul <seanpaul@chromium.org> | 2016-04-21 16:25:06 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2016-05-10 04:26:17 -0400 |
| commit | 637699644d49ef96e2243ddab67ee6a795800b1b (patch) | |
| tree | 29d97de47d4af10804d93ab5908bd0a188126f6f | |
| parent | 84b8fe0eebaa9775212a49b7576bbef847fe594d (diff) | |
| download | drm_hwcomposer-637699644d49ef96e2243ddab67ee6a795800b1b.tar.gz drm_hwcomposer-637699644d49ef96e2243ddab67ee6a795800b1b.tar.xz | |
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>
| -rw-r--r-- | drmcomposition.h | 2 | ||||
| -rw-r--r-- | drmcompositor.h | 2 | ||||
| -rw-r--r-- | drmdisplaycomposition.h | 2 | ||||
| -rw-r--r-- | drmgenericimporter.cpp | 2 | ||||
| -rw-r--r-- | drmgenericimporter.h | 2 | ||||
| -rw-r--r-- | hwcomposer.cpp | 2 | ||||
| -rw-r--r-- | nvimporter.cpp | 2 | ||||
| -rw-r--r-- | nvimporter.h | 2 | ||||
| -rw-r--r-- | platform.h (renamed from importer.h) | 0 |
9 files changed, 8 insertions, 8 deletions
diff --git a/drmcomposition.h b/drmcomposition.h index bff885e..ccb7184 100644 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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> |