summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hartman <ghartman@google.com>2018-10-11 16:33:50 -0700
committerGreg Hartman <ghartman@google.com>2018-10-12 19:34:53 +0000
commit9d046f10483b7572e5ff7874a483b994047614e4 (patch)
tree1477781ac0de63a1ff0fa46fd1aeada1037887ea
parentff234ae4223e32e93a2c3012524e1129d1e185b2 (diff)
downloadplatform_external_minigbm-oreo-cuttlefish-testing.tar.gz
platform_external_minigbm-oreo-cuttlefish-testing.tar.bz2
platform_external_minigbm-oreo-cuttlefish-testing.zip
Compatiblity fixes for oreooreo-cuttlefish-testing
BUG: 117610821 Test: Compiles, boots, gralloc.minigbm present Change-Id: If1ec1acdddf9ba9f79a67602000c4c0b0da503ea Exempt-From-Owner-Approval: Build break with sole owner OOO
-rw-r--r--Android.mk2
-rw-r--r--drv.h12
2 files changed, 13 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 1c52e2a..3f9ce50 100644
--- a/Android.mk
+++ b/Android.mk
@@ -69,7 +69,7 @@ LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_SUFFIX := $(TARGET_SHLIB_SUFFIX)
LOCAL_HEADER_LIBRARIES += \
- libhardware_headers libnativebase_headers libsystem_headers
+ libhardware_headers libsystem_headers
LOCAL_SHARED_LIBRARIES += libnativewindow libsync liblog
LOCAL_STATIC_LIBRARIES += libarect
include $(BUILD_SHARED_LIBRARY)
diff --git a/drv.h b/drv.h
index d27e845..cf19a98 100644
--- a/drv.h
+++ b/drv.h
@@ -12,6 +12,18 @@ extern "C" {
#endif
#include <drm_fourcc.h>
+
+/* Include some additional formats that are missing on older drm */
+#ifndef DRM_FORMAT_R8
+#define DRM_FORMAT_R8 fourcc_code('R', '8', ' ', ' ') /* [7:0] R */
+#endif
+#ifndef DRM_FORMAT_GR88
+#define DRM_FORMAT_GR88 fourcc_code('G', 'R', '8', '8') /* [15:0] G:R 8:8 little endian */
+#endif
+#ifndef DRM_FORMAT_RG88
+#define DRM_FORMAT_RG88 fourcc_code('R', 'G', '8', '8') /* [15:0] R:G 8:8 little endian */
+#endif
+
#include <stdint.h>
#define DRV_MAX_PLANES 4