commit 77a0f3a942f75e51b0f5a24d97efb7dd8b1edb97
author Nicolas Capens <capn@google.com> Fri Apr 29 14:17:00 2016 -0400
committer Nicolas Capens <capn@google.com> Fri Apr 29 18:29:50 2016 +0000
tree 3c830b789c7e4081f239a680174cf0673bcb4194
parent 0704728b06dcbe592e81be7f39778a36114d7391

Use a wildcard for detecting GCE builds.

Change-Id: Iddd9acf8496abe4dfa147f8a59b4cfb2f23df3a7
Reviewed-on: https://swiftshader-review.googlesource.com/5261
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index 239c779..694e6a3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,7 @@
 endif
 
 ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
-ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE))$(filter sdk_google_% google_sdk_%, $(TARGET_PRODUCT)),)
+ifneq ($(filter gce gce% calypso, $(TARGET_DEVICE))$(filter sdk_google_% google_sdk_%, $(TARGET_PRODUCT)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
 endif

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 5b4be7b..358c455 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -95,7 +95,7 @@
 	-DANDROID_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION) \
 	-std=c++11
 
-ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE)),)
+ifneq ($(filter gce gce% calypso, $(TARGET_DEVICE)),)
 COMMON_CFLAGS += -DDISPLAY_LOGO=0
 endif