libminuitwrp updates for Pixel 3 devices
Fix rules for adf graphics to detect their presence when ninja
make files are used.
Change pixelflinger graphics mode so that colors display properly
on the Pixel 3
Change-Id: Ie7181be6c5e1e9a007b58fd798b2cef787ce4a01
diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index 3b0f7de..0f8aae6 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -34,7 +34,7 @@
LOCAL_C_INCLUDES += $(commands_recovery_local_path)/minuitwrp/include
# The header files required for adf graphics can cause compile errors
# with adf graphics.
- ifneq ($(wildcard system/core/adf/Android.mk),)
+ ifneq ($(wildcard system/core/adf/Android.*),)
LOCAL_CFLAGS += -DHAS_ADF
LOCAL_SRC_FILES += graphics_adf.cpp
LOCAL_WHOLE_STATIC_LIBRARIES += libadf
diff --git a/minuitwrp/graphics_adf.cpp b/minuitwrp/graphics_adf.cpp
index b71bed2..7b37271 100644
--- a/minuitwrp/graphics_adf.cpp
+++ b/minuitwrp/graphics_adf.cpp
@@ -136,7 +136,6 @@
static int adf_device_init(adf_pdata *pdata, adf_device *dev)
{
adf_id_t intf_id;
- int intf_fd;
int err;
err = adf_find_simple_post_configuration(dev, &pdata->format, 1, &intf_id,
diff --git a/minuitwrp/graphics_drm.cpp b/minuitwrp/graphics_drm.cpp
index c321bb7..409a123 100644
--- a/minuitwrp/graphics_drm.cpp
+++ b/minuitwrp/graphics_drm.cpp
@@ -157,8 +157,8 @@
printf("setting DRM_FORMAT_ABGR8888 and GGL_PIXEL_FORMAT_BGRA_8888, GGL_PIXEL_FORMAT may not match!\n");
#elif defined(RECOVERY_RGBX)
format = DRM_FORMAT_XBGR8888;
- base_format = GGL_PIXEL_FORMAT_BGRA_8888;
- printf("setting DRM_FORMAT_XBGR8888 and GGL_PIXEL_FORMAT_BGRA_8888, GGL_PIXEL_FORMAT may not match!\n");
+ base_format = GGL_PIXEL_FORMAT_RGBA_8888;
+ printf("setting DRM_FORMAT_XBGR8888 and GGL_PIXEL_FORMAT_RGBA_8888\n");
#else
format = DRM_FORMAT_RGB565;
base_format = GGL_PIXEL_FORMAT_BGRA_8888;