diff --git a/Android.mk b/Android.mk
index 31db4f2..d598d71 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,11 @@
 EMUGL_COMMON_CFLAGS := -DWITH_GLES2 -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 
 ifeq (O, $(PLATFORM_VERSION_CODENAME))
-    EMUGL_COMMON_CFLAGS += -DGOLDFISH_HIDL_GRALLOC
+EMUGL_COMMON_CFLAGS += -DGOLDFISH_HIDL_GRALLOC
+endif
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25 && echo isApi26OrHigher),isApi26OrHigher)
+EMUGL_COMMON_CFLAGS += -DGOLDFISH_HIDL_GRALLOC
 endif
 
 ifdef IS_AT_LEAST_OPD1