diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2018-10-19 15:06:03 +0200 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2019-01-16 17:11:28 +0100 |
| commit | 2f685279fd3de5d0cb714f86a3c72bc437e2bffb (patch) | |
| tree | bbc6e1f8b5ffa80e056381e2210522c5ed425f14 | |
| parent | minuitwrp: Fix detection of libdrm on Pie (diff) | |
| download | android_bootable_recovery-2f685279fd3de5d0cb714f86a3c72bc437e2bffb.tar android_bootable_recovery-2f685279fd3de5d0cb714f86a3c72bc437e2bffb.tar.gz android_bootable_recovery-2f685279fd3de5d0cb714f86a3c72bc437e2bffb.tar.bz2 android_bootable_recovery-2f685279fd3de5d0cb714f86a3c72bc437e2bffb.tar.lz android_bootable_recovery-2f685279fd3de5d0cb714f86a3c72bc437e2bffb.tar.xz android_bootable_recovery-2f685279fd3de5d0cb714f86a3c72bc437e2bffb.tar.zst android_bootable_recovery-2f685279fd3de5d0cb714f86a3c72bc437e2bffb.zip | |
| -rw-r--r-- | minuitwrp/Android.mk | 2 | ||||
| -rw-r--r-- | minuitwrp/graphics_adf.cpp | 1 | ||||
| -rw-r--r-- | minuitwrp/graphics_drm.cpp | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk index 3b0f7de74..0f8aae6d3 100644 --- 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 index b71bed2a8..7b37271ec 100644 --- a/minuitwrp/graphics_adf.cpp +++ b/minuitwrp/graphics_adf.cpp @@ -136,7 +136,6 @@ done: 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 c321bb7d8..409a12378 100644 --- 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; |