From 256462a4a0fb181aca670fba4241e2fe0cd295f8 Mon Sep 17 00:00:00 2001
From: Lingfeng Yang <lfy@google.com>
Date: Mon, 5 Jun 2017 11:50:17 -0700
Subject: 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 67445821..3ab6a6c6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,11 @@ EMUGL_COMMON_INCLUDES := $(EMUGL_PATH)/host/include/libOpenglRender $(EMUGL_PATH
 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)
-- 
cgit v1.2.3