commit fa3e9d102a7358a6e5bcd15db8015db6b7fcacd7
author android-build-team Robot <android-build-team-robot@google.com> Sun Jun 25 07:48:36 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Jun 25 07:48:36 2017 +0000
tree 9ef0aead3c5fd4b6f270ed06e7dc9ecdd484e818
parent 7baa23acbb8ae955008a33433801f74cba525744
parent c58a209b8020ba18e354dc3f5cc33c98229f4d44

release-request-c5216b17-dc50-4b24-831c-dc696ed657cc-for-git_oc-dr1-release-4133426 snap-temp-L83500000077479774

Change-Id: I085687e518f4dcd512810f338cfe6300343a9354

Android.mk

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