Remove support for non Minigbm backends on Android.

We are not testing these backends and we have got to a stage
where it's getting hard to maintain both. Let's get them
back if the need arises.

Jira: None.
Test: Build passes on Android.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>

diff --git a/Android.common.mk b/Android.common.mk
index 3863e37..58de71a 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -118,14 +118,8 @@ LOCAL_SHARED_LIBRARIES += \
        libva \
        libva-android
 
-ifeq ($(strip $(BOARD_USES_MINIGBM)), true)
-LOCAL_CPPFLAGS += -DUSE_MINIGBM
 LOCAL_C_INCLUDES += \
        $(INTEL_MINIGBM)/cros_gralloc/
-else
-LOCAL_C_INCLUDES += \
-       $(INTEL_DRM_GRALLOC)
-endif
 
 ifeq ($(shell test $(ANDROID_VERSION) -ge 8; echo $$?), 0)
 LOCAL_SHARED_LIBRARIES += libnativewindow

diff --git a/common/Android.mk b/common/Android.mk
index 28be1ce..704ba8d 100644 (file)
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -142,14 +142,8 @@ LOCAL_SRC_FILES += \
         compositor/gl/shim.cpp
 endif
 
-ifeq ($(strip $(BOARD_USES_MINIGBM)), true)
-LOCAL_CPPFLAGS += -DUSE_MINIGBM
 LOCAL_C_INCLUDES += \
         $(INTEL_MINIGBM)/cros_gralloc/
-else
-LOCAL_C_INCLUDES += \
-        $(INTEL_DRM_GRALLOC)
-endif
 
 LOCAL_MODULE := libhwcomposer_common
 LOCAL_CFLAGS += -fvisibility=default

diff --git a/os/android/utils_android.h b/os/android/utils_android.h
index 08be8ab..a3d8a47 100644 (file)
--- a/os/android/utils_android.h
+++ b/os/android/utils_android.h
@@ -27,10 +27,8 @@
 
 #include "platformdefines.h"
 
-#ifdef USE_MINIGBM
 #include <cros_gralloc_handle.h>
 #include <cros_gralloc_helpers.h>
-#endif
 
 #include <hwcdefs.h>
 #include "hwcbuffer.h"
@@ -134,10 +132,8 @@ static uint32_t DrmFormatToHALFormat(int format) {
     case DRM_FORMAT_VYUY:
     case DRM_FORMAT_AYUV:
       return 0;
-#ifdef USE_MINIGBM
     case DRM_FORMAT_NV12:
       return HAL_PIXEL_FORMAT_NV12;
-#endif
     case DRM_FORMAT_NV21:
       return HAL_PIXEL_FORMAT_YCrCb_420_SP;
     case DRM_FORMAT_NV16:
@@ -160,10 +156,8 @@ static uint32_t DrmFormatToHALFormat(int format) {
       return HAL_PIXEL_FORMAT_YCbCr_444_888;
     case DRM_FORMAT_YVU444:
       return 0;
-#ifdef USE_MINIGBM
     case DRM_FORMAT_NV12_Y_TILED_INTEL:
       return HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL;
-#endif
     case DRM_FORMAT_P010:
       return HAL_PIXEL_FORMAT_P010_INTEL;
     default:
@@ -217,7 +211,7 @@ static void DestroyBufferHandle(HWCNativeHandle handle) {
   delete handle;
   handle = NULL;
 }
-#ifdef USE_MINIGBM
+
 static bool CreateGraphicsBuffer(uint32_t w, uint32_t h, int format,
                                  HWCNativeHandle *handle, uint32_t layer_type) {
   struct gralloc_handle *temp = new struct gralloc_handle();
@@ -317,7 +311,6 @@ static bool ImportGraphicsBuffer(HWCNativeHandle handle, HwcBuffer *bo,
 
   return true;
 }
-#endif
 #ifdef __cplusplus
 }
 #endif

diff --git a/wsi/Android.mk b/wsi/Android.mk
index a8d1840..5409b31 100644 (file)
--- a/wsi/Android.mk
+++ b/wsi/Android.mk
@@ -91,14 +91,8 @@ LOCAL_CPPFLAGS += \
         -DUSE_GL
 endif
 
-ifeq ($(strip $(BOARD_USES_MINIGBM)), true)
-LOCAL_CPPFLAGS += -DUSE_MINIGBM
 LOCAL_C_INCLUDES += \
-        $(INTEL_MINIGBM)/cros_gralloc/
-else
-LOCAL_C_INCLUDES += \
-        $(INTEL_DRM_GRALLOC)
-endif
+       $(INTEL_MINIGBM)/cros_gralloc/
 
 ifeq ($(strip $(DISABLE_HOTPLUG_SUPPORT)), true)
 LOCAL_CPPFLAGS += \