diff --git a/Android.mk b/Android.mk
index ce7c599ad3b6d05ea2456056425c9d67a15e50e0..6cf46516370f215cb7ee5e22509a007711f58c85 100644
--- a/Android.mk
+++ b/Android.mk
@@ -73,7 +73,6 @@ 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
diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp
index fa30e501896ddd533b5f54a2b518929a58ba963f..d76ac0b9d74e23e08e08bfae11c5d3fcb3ccb3da 100644
--- a/system/gralloc/gralloc.cpp
+++ b/system/gralloc/gralloc.cpp
@@ -1542,10 +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.
+#if PLATFORM_SDK_VERSION >= 28 // In Q, we want to specify these, but SDK version is not 29 yet. do not merge this to P
         validateBufferSize: NULL,
         getTransportSize: NULL,
-#endif // PLATFORM_VERSION > 9
+#endif // PLATFORM_VERSION > 28
 #if PLATFORM_SDK_VERSION >= 18
         lock_ycbcr: gralloc_lock_ycbcr,
 #endif // PLATFORM_SDK_VERSION >= 18