Use a wildcard for detecting GCE builds.

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

Use a wildcard for detecting GCE builds.
77a0f3a9 · Nicolas Capens · 0704728b · 77a0f3a9 · 77a0f3a9
Commit 77a0f3a9 authored Apr 29, 2016 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Android.mk Android.mk +1 -1

Android.mk src/Android.mk +1 -1

No files found.
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,7 @@ SWIFTSHADER_OPTIM := release
 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
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -95,7 +95,7 @@ COMMON_CFLAGS := \
 	-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