commit c58a209b8020ba18e354dc3f5cc33c98229f4d44
author Lingfeng Yang <lfy@google.com> Fri Jun 23 19:47:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 23 19:47:22 2017 +0000
tree 9ef0aead3c5fd4b6f270ed06e7dc9ecdd484e818
parent da6b73888f6377b8b07309dc7c32d22a97224a2f
parent 256462a4a0fb181aca670fba4241e2fe0cd295f8

Fix API 26 for public emulators, take 2
am: 256462a4a0

Change-Id: If592f6de46a5b49e43d8db0c0715edf93cfdfb90

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