commit d1ec5cb3b75c40082875cbe328fcf1e5e48867b0
author Nicolas Capens <capn@google.com> Fri Feb 05 10:05:36 2016 -0500
committer Nicolas Capens <capn@google.com> Fri Feb 05 22:02:18 2016 +0000
tree 29debb258b2494c9262c20ac04de59abd5323dce
parent 19900d6f75e65b64092eb25ce166bedd0c5bf26e

Enable klp-emu-dev google x86 to build swiftshader libraries

The name for google image is "google_sdk_x86" on older Android versions.

Change-Id: If1e9cb368284b91787badf329e558af5d0b9042c
Reviewed-on: https://swiftshader-review.googlesource.com/4692
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 1c72393..a2f41fb 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_%, $(TARGET_PRODUCT)),)
+ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE))$(filter sdk_google_% google_sdk_%, $(TARGET_PRODUCT)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
 endif
\ No newline at end of file