diff options
| author | Roman Stratiienko <roman.stratiienko@globallogic.com> | 2019-11-27 19:23:03 +0200 |
|---|---|---|
| committer | Roman Stratiienko <roman.stratiienko@globallogic.com> | 2019-11-27 19:43:15 +0200 |
| commit | 6f5e450d50952e5354bafabae7b4001dbf4c35eb (patch) | |
| tree | 8e8cf7e8d95d666435f269e317cd665dc117eb9d | |
| parent | d07c370592056ac25e1d5c666ba3845df8165dad (diff) | |
drm_hwcomposer: Fix missing definition build error on P and earlier
DRM_FORMAT_INVALID was introduced after libdrm-2.4.94, and does not exists in
Android-P and earlier.
Fixes: f63726cabf3f ("drm_hwcomposer: avoid using signed errno on uint32 type")
Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com>
| -rw-r--r-- | platform/platformdrmgeneric.cpp | 1 | ||||
| -rw-r--r-- | platform/platformdrmgeneric.h | 6 | ||||
| -rw-r--r-- | platform/platformhisi.cpp | 1 | ||||
| -rw-r--r-- | platform/platformimagination.cpp | 1 | ||||
| -rw-r--r-- | platform/platformmeson.cpp | 1 | ||||
| -rw-r--r-- | platform/platformminigbm.cpp | 1 |
6 files changed, 6 insertions, 5 deletions
diff --git a/platform/platformdrmgeneric.cpp b/platform/platformdrmgeneric.cpp index f8a1858..0883b90 100644 --- a/platform/platformdrmgeneric.cpp +++ b/platform/platformdrmgeneric.cpp @@ -20,7 +20,6 @@ #include "drmdevice.h" #include "platform.h" -#include <drm/drm_fourcc.h> #include <xf86drm.h> #include <xf86drmMode.h> diff --git a/platform/platformdrmgeneric.h b/platform/platformdrmgeneric.h index 88bff5f..7bb2ea2 100644 --- a/platform/platformdrmgeneric.h +++ b/platform/platformdrmgeneric.h @@ -22,6 +22,12 @@ #include <hardware/gralloc.h> +#include <drm/drm_fourcc.h> + +#ifndef DRM_FORMAT_INVALID +#define DRM_FORMAT_INVALID 0 +#endif + namespace android { class DrmGenericImporter : public Importer { diff --git a/platform/platformhisi.cpp b/platform/platformhisi.cpp index 874a31c..2e6ac43 100644 --- a/platform/platformhisi.cpp +++ b/platform/platformhisi.cpp @@ -20,7 +20,6 @@ #include "drmdevice.h" #include "platform.h" -#include <drm/drm_fourcc.h> #include <stdatomic.h> #include <xf86drm.h> #include <xf86drmMode.h> diff --git a/platform/platformimagination.cpp b/platform/platformimagination.cpp index b94ca0b..565e6ee 100644 --- a/platform/platformimagination.cpp +++ b/platform/platformimagination.cpp @@ -1,7 +1,6 @@ #define LOG_TAG "hwc-platform-imagination" #include "platformimagination.h" -#include <drm/drm_fourcc.h> #include <log/log.h> #include <xf86drm.h> diff --git a/platform/platformmeson.cpp b/platform/platformmeson.cpp index 10c2745..5184972 100644 --- a/platform/platformmeson.cpp +++ b/platform/platformmeson.cpp @@ -20,7 +20,6 @@ #include "drmdevice.h" #include "platform.h" -#include <drm/drm_fourcc.h> #include <stdatomic.h> #include <xf86drm.h> #include <xf86drmMode.h> diff --git a/platform/platformminigbm.cpp b/platform/platformminigbm.cpp index ad0a373..a65e196 100644 --- a/platform/platformminigbm.cpp +++ b/platform/platformminigbm.cpp @@ -20,7 +20,6 @@ #include "drmdevice.h" #include "platform.h" -#include <drm/drm_fourcc.h> #include <xf86drm.h> #include <xf86drmMode.h> |