Snap for 5537346 from d4fa2de8 to qt-release

Change-Id: Iedfc014e298e5e648dd923e66133aea10069eafe

Android.mk

@@ -73,6 +73,7 @@ ifeq (true,$(BUILD_EMULATOR_OPENGL)) # Guest build
 GOLDFISH_OPENGL_SHOULD_BUILD := true
 
 EMUGL_COMMON_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
+EMUGL_COMMON_CFLAGS += -DPLATFORM_VERSION=$(PLATFORM_VERSION)
 
 ifeq (O, $(PLATFORM_VERSION_CODENAME))
 EMUGL_COMMON_CFLAGS += -DGOLDFISH_HIDL_GRALLOC

system/gralloc/gralloc.cpp

@@ -1542,6 +1542,10 @@ struct private_module_t HAL_MODULE_INFO_SYM = {
         lock: gralloc_lock,
         unlock: gralloc_unlock,
         perform: NULL,
+#if PLATFORM_VERSION > 9 // In Q, we want to specify these, but SDK version is not 29 yet.
+        validateBufferSize: NULL,
+        getTransportSize: NULL,
+#endif // PLATFORM_VERSION > 9
 #if PLATFORM_SDK_VERSION >= 18
         lock_ycbcr: gralloc_lock_ycbcr,
 #endif // PLATFORM_SDK_VERSION >= 18