commit b4d30d959b595c2e531773fd530114172a8bfb06
author Nicolas Capens <capn@google.com> Fri Dec 04 12:09:28 2015 -0500
committer Nicolas Capens <capn@google.com> Fri Dec 04 19:03:36 2015 +0000
tree d207680275ec969ca288eee6a3dc0df3d5b25726
parent 036125ecba352645da49a1e7c230021ee98faebc

Enable x86-64 builds for Android.

Change-Id: Ief54422c0c0d82c773f96f4491bfebb7ee717ba8
Reviewed-on: https://swiftshader-review.googlesource.com/4351
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-on: https://swiftshader-review.googlesource.com/4353
Reviewed-by: Nicolas Capens <capn@google.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index 575c18f..1c72393 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,7 @@
 SWIFTSHADER_OPTIM := release
 endif
 
-ifneq ($(filter x86, $(TARGET_ARCH)),)
+ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
 ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE))$(filter sdk_google_%, $(TARGET_PRODUCT)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif