commit 41b609aed54b54e3554d85ceba383f949c1e6751
author Chia-I Wu <olv@google.com> Tue Mar 13 17:19:54 2018 +0000
committer Chia-I Wu <olv@google.com> Tue Mar 13 20:30:26 2018 +0000
tree bb5e60ccba96770477b0f597830895e78791824b
parent a4e3b5cac5adce56a396dd86734476af0ebf2b78

Revert "Remove software flex pixel formats"

This reverts commit a4e3b5cac5adce56a396dd86734476af0ebf2b78.

Bug: 70526789
Reason for revert: breaking builds elsewhere
Change-Id: I63be12276ed5981e99ef45321d7c5f3e0135121b

guest/hals/gralloc/legacy/gralloc_vsoc_priv.h

diff --git a/guest/hals/gralloc/legacy/gralloc_vsoc_priv.h b/guest/hals/gralloc/legacy/gralloc_vsoc_priv.h
index 3e92f18..d4082f5 100644
--- a/guest/hals/gralloc/legacy/gralloc_vsoc_priv.h
+++ b/guest/hals/gralloc/legacy/gralloc_vsoc_priv.h
@@ -194,8 +194,16 @@
       return "RAW10";
 #endif
 #if VSOC_PLATFORM_SDK_AFTER(L_MR1)
+    case HAL_PIXEL_FORMAT_YCbCr_444_888:
+      return "YCbCr_444_888";
+    case HAL_PIXEL_FORMAT_YCbCr_422_888:
+      return "YCbCr_422_888";
     case HAL_PIXEL_FORMAT_RAW12:
       return "RAW12";
+    case HAL_PIXEL_FORMAT_FLEX_RGBA_8888:
+      return "FLEX_RGBA_8888";
+    case HAL_PIXEL_FORMAT_FLEX_RGB_888:
+      return "FLEX_RGB_888";
 #endif
 
       // Formats that have been removed
@@ -219,17 +227,6 @@
     case HAL_PIXEL_FORMAT_sRGB_A_8888:
       return "sRGB_A_8888";
 #endif
-#if VSOC_PLATFORM_SDK_AFTER(L_MR1) && VSOC_PLATFORM_SDK_BEFORE(P)
-    // Added in LMR1. Hidden from HALs since P.
-    case HAL_PIXEL_FORMAT_YCbCr_444_888:
-      return "YCbCr_444_888";
-    case HAL_PIXEL_FORMAT_YCbCr_422_888:
-      return "YCbCr_422_888";
-    case HAL_PIXEL_FORMAT_FLEX_RGBA_8888:
-      return "FLEX_RGBA_8888";
-    case HAL_PIXEL_FORMAT_FLEX_RGB_888:
-      return "FLEX_RGB_888";
-#endif
   }
   return "UNKNOWN";
 }