Prevent crashing when no current program is set.

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

diff --git a/Android.mk b/Android.mk
index 239c779..a89cdf0 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -14,14 +14,22 @@
 # limitations under the License.
 #
 
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
 
-ifndef SWIFTSHADER_OPTIM
-SWIFTSHADER_OPTIM := release
+# Use Subzero as the Reactor JIT back-end on ARM, else LLVM.
+ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm))
+use_subzero := true
 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)),)
-include $(call all-makefiles-under,$(LOCAL_PATH))
+# Subzero requires full C++11 support, which is available from Marshmallow and up.
+ifdef use_subzero
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
+unsupported_build := true
+endif
 endif
+
+ifndef unsupported_build
+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