aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLingfeng Yang <lfy@google.com>2017-06-23 19:42:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-23 19:42:53 +0000
commit8ca67b0ba92a87a89c39f3587e9d49529ababb7c (patch)
treeaf2031902d6286d79b9303b825b29c462f236524
parentb4f0b486db0d3e6503d219cfc7077b86728abe21 (diff)
parent256462a4a0fb181aca670fba4241e2fe0cd295f8 (diff)
downloaddevice_generic_goldfish-opengl-8ca67b0ba92a87a89c39f3587e9d49529ababb7c.tar.gz
device_generic_goldfish-opengl-8ca67b0ba92a87a89c39f3587e9d49529ababb7c.tar.bz2
device_generic_goldfish-opengl-8ca67b0ba92a87a89c39f3587e9d49529ababb7c.zip
Fix API 26 for public emulators, take 2
am: 256462a4a0 Change-Id: Ia106c2a90b1e7d232ea099a46976358bdbcf35bf
-rw-r--r--Android.mk6
1 files changed, 5 insertions, 1 deletions
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)