Skip to content

S
swiftshader
Commit 352e56c4 by Nicolas Capens Committed by Nicolas Capens
Options

Restrict building Subzero to Marshmallow and up.

Subzero requires full C++11 support, which isn't available on Android versions prior to Marshmallow. Change-Id: Icf09a51b525a1503f72441c969a9e364306096bd Reviewed-on: https://swiftshader-review.googlesource.com/11488Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 5bf72ee3
Showing with 16 additions and 6 deletions
Android.mk
......@@ -14,8 +14,22 @@
# limitations under the License.
#
LOCAL_PATH:= $(call my-dir)
LOCAL_PATH := $(call my-dir)
# Use Subzero as the Reactor JIT back-end on ARM, else LLVM.
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm))
use_subzero := true
endif
# 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
src/Android.mk
LOCAL_PATH:= $(call my-dir)
# Use Subzero as the Reactor JIT back-end on ARM, else LLVM.
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm))
use_subzero := true
endif
COMMON_C_INCLUDES += \
bionic \
$(LOCAL_PATH)/../include \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment