Snap for 5540187 from 0d52ede1 to qt-release

Change-Id: If621cd778baca630366423abd0a1e6b68279654f

gralloc/Android.mk

@@ -32,7 +32,7 @@ LOCAL_HEADER_LIBRARIES := libhardware_headers
 
 LOCAL_MODULE := gralloc.goldfish.default
 LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -Wno-missing-field-initializers
-LOCAL_CFLAGS:= -DPLATFORM_VERSION=$(PLATFORM_VERSION)
+LOCAL_CFLAGS:= -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 ifeq ($(TARGET_USE_PAN_DISPLAY),true)
 LOCAL_CFLAGS += -DUSE_PAN_DISPLAY=1
 endif

gralloc/gralloc.cpp

@@ -89,7 +89,7 @@ struct private_module_t HAL_MODULE_INFO_SYM = {
         .unregisterBuffer = gralloc_unregister_buffer,
         .lock = gralloc_lock,
         .unlock = gralloc_unlock,
-#if PLATFORM_VERSION > 9
+#if PLATFORM_SDK_VERSION >= 28
         .validateBufferSize = NULL,
         .getTransportSize = NULL,
 #endif