aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Capens <capn@google.com>2016-06-30 13:15:27 -0400
committerNicolas Capens <capn@google.com>2017-02-03 14:36:12 +0000
commit91d90ffb38d90addf8a46da3140d69fc09f79489 (patch)
tree6e891acb6bfcab38d3a81a6db6f1ad91fc0ae29f
parent42856bda27a3e54079e5b1a11200eced2ff3a816 (diff)
downloadswiftshader-91d90ffb38d90addf8a46da3140d69fc09f79489.tar.gz
Enable building SwiftShader for any Android target.
Change-Id: Ifcfb673ed5f4c0eec0c24c829002aaf1b9870ad5 Reviewed-on: https://swiftshader-review.googlesource.com/5751 Reviewed-by: Meng-Lin Wu <marleymoo@google.com> Reviewed-by: Bo Hu <bohu@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com> (cherry picked from commit bea359685df6343901a674e37dbd32721062e49d) Reviewed-on: https://swiftshader-review.googlesource.com/5761 Reviewed-by: Greg Hartman <ghartman@google.com>
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 694e6a3f4..e7a9d76fb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,5 @@ SWIFTSHADER_OPTIM := release
endif
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
-ifneq ($(filter gce gce% calypso, $(TARGET_DEVICE))$(filter sdk_google_% google_sdk_%, $(TARGET_PRODUCT)),)
include $(call all-makefiles-under,$(LOCAL_PATH))
endif
-endif