commit 1e8a8c194fa3bbb7b922080a883d458d1ee9d2ae
author Chia-I Wu <olv@google.com> Fri Mar 09 09:53:39 2018 -0800
committer Greg Hartman <ghartman@google.com> Tue Mar 20 17:46:19 2018 -0700
tree 0b1aaca9042cfaff5e0417e1406b1d333feed4fb
parent ddee0445c019ec6ccd001f3c8850464e9b912127

Remove software flex pixel formats

They are moved to system/graphics-sw.h and are hidden from HALs.

Bug: 70526789
Test: none
Change-Id: I4fd318c3b0135eb18be62b3286fa9348c3519881

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 f810650..71e38be 100644
--- a/guest/hals/gralloc/legacy/gralloc_vsoc_priv.h
+++ b/guest/hals/gralloc/legacy/gralloc_vsoc_priv.h
@@ -228,16 +228,8 @@
       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
@@ -261,6 +253,17 @@
     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";
 }