Fix RValue<T> construction from incorrect types.

[android-x86/external-swiftshader.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 1c72393..b4d82e3 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -16,12 +16,6 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-ifndef SWIFTSHADER_OPTIM
-SWIFTSHADER_OPTIM := release
-endif
-
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
-ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE))$(filter sdk_google_%, $(TARGET_PRODUCT)),)
+ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm))
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
-endif
\ No newline at end of file