commit 256462a4a0fb181aca670fba4241e2fe0cd295f8
author Lingfeng Yang <lfy@google.com> Mon Jun 05 11:50:17 2017 -0700
committer Yao Chen <yaochen@google.com> Fri Jun 23 10:08:21 2017 -0700
tree af2031902d6286d79b9303b825b29c462f236524
parent ef6676015bfec4538a552204b51e32f02d721fb0

Fix API 26 for public emulators, take 2

Bug: 37302997
Bug: 62333501

codename changed from O to REL

So add a case for API level too

Test: Build and run sdk_google_aw_x86-userdebug emulator

Change-Id: I91f3804082bc6d61922d31ce72081a2ec88bc6b0

Android.mk

diff --git a/Android.mk b/Android.mk
index 6744582..3ab6a6c 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
 
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 18 && echo PreJellyBeanMr2),PreJellyBeanMr2)