commit d8ad95e6531dc08b3072bcb77728f1b3878b1220
author Nick Desaulniers <ndesaulniers@google.com> Fri Jan 10 09:39:48 2020 -0800
committer Nick Desaulniers <ndesaulniers@google.com> Fri Jan 10 09:39:48 2020 -0800
tree 5917c5f800f946f7d66ffa026ac940e764f758ec
parent 8d00806a4d62e812c4a97de116754e1f1311d30f

goldfish-opengl: fix -Wreorder-init-list

C++20 requires members of designated initializers to be in order, unlike
C99.

Bug: 139945549
Test: presubmit on aosp/1182879
Change-Id: Ib2a3a57c7d59cb869cd9bd09887eb04692c5a8b6
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>

system/gralloc/gralloc_old.cpp

diff --git a/system/gralloc/gralloc_old.cpp b/system/gralloc/gralloc_old.cpp
index 683c288..a56efa6 100644
--- a/system/gralloc/gralloc_old.cpp
+++ b/system/gralloc/gralloc_old.cpp
@@ -1527,13 +1527,13 @@
         lock: gralloc_lock,
         unlock: gralloc_unlock,
         perform: NULL,
-#if PLATFORM_SDK_VERSION >= 29 // For Q and later
-        validateBufferSize: NULL,
-        getTransportSize: NULL,
-#endif // PLATFORM_SDK_VERSION >= 29
 #if PLATFORM_SDK_VERSION >= 18
         lock_ycbcr: gralloc_lock_ycbcr,
 #endif // PLATFORM_SDK_VERSION >= 18
+#if PLATFORM_SDK_VERSION >= 29 // For Q and later
+        getTransportSize: NULL,
+        validateBufferSize: NULL,
+#endif // PLATFORM_SDK_VERSION >= 29
     }
 };