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
bigbiff · Jan 16, 2019 · 2f68527 · 2f68527
1 parent d842fe1
commit 2f68527
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
@@ -34,7 +34,7 @@ else
   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
@@ -136,7 +136,6 @@ static int adf_interface_init(adf_pdata *pdata)
 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
@@ -157,8 +157,8 @@ static drm_surface *drm_create_surface(int width, int height) {
     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;