Skip to content

S
swiftshader
Commit 2ecc8b71 by Logan Chien
Options

Add SWIFTSHADER prefix to Android.mk variables

This commit replaces use_subzero with SWIFTSHADER_USE_SUBZERO and unsupported_build with SWIFTSHADER_UNSUPPORTED_BUILD in Android.mk so that it can be consistent with other variables. Change-Id: Ia22cc88bc5804d7d2bea942bbceb2fc30c88aa18 Reviewed-on: https://swiftshader-review.googlesource.com/20588Tested-by: 's avatarLogan Chien <loganchien@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 25c541e5
Showing with 10 additions and 10 deletions
Android.mk
...@@ -24,13 +24,13 @@ ifeq ($(SWIFTSHADER_LLVM_VERSION),3) ...@@ -24,13 +24,13 @@ ifeq ($(SWIFTSHADER_LLVM_VERSION),3)
# Reactor with LLVM 3.0 doesn't support ARM. Use Subzero as the Reactor JIT # Reactor with LLVM 3.0 doesn't support ARM. Use Subzero as the Reactor JIT
# back-end on ARM. # back-end on ARM.
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm)) ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm))
use_subzero := true SWIFTSHADER_USE_SUBZERO := true
endif endif
endif endif
# Check whether SwiftShader requires full C++ 11 support. # Check whether SwiftShader requires full C++ 11 support.
ifdef use_subzero ifdef SWIFTSHADER_USE_SUBZERO
SWIFTSHADER_REQUIRES_CXX11 := true SWIFTSHADER_REQUIRES_CXX11 := true
endif endif
...@@ -41,7 +41,7 @@ endif ...@@ -41,7 +41,7 @@ endif
ifeq ($(SWIFTSHADER_REQUIRES_CXX11),true) ifeq ($(SWIFTSHADER_REQUIRES_CXX11),true)
# Full C++ 11 support is only available from Marshmallow and up. # Full C++ 11 support is only available from Marshmallow and up.
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
unsupported_build := true SWIFTSHADER_UNSUPPORTED_BUILD := true
endif endif
endif endif
...@@ -49,17 +49,17 @@ endif ...@@ -49,17 +49,17 @@ endif
# Check whether $(TARGET_ARCH) is supported. # Check whether $(TARGET_ARCH) is supported.
ifeq ($(SWIFTSHADER_LLVM_VERSION),3) ifeq ($(SWIFTSHADER_LLVM_VERSION),3)
ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm)) ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm))
unsupported_build := true SWIFTSHADER_UNSUPPORTED_BUILD := true
endif endif
endif endif
ifeq ($(SWIFTSHADER_LLVM_VERSION),7) ifeq ($(SWIFTSHADER_LLVM_VERSION),7)
ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm arm64)) ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm arm64))
unsupported_build := true SWIFTSHADER_UNSUPPORTED_BUILD := true
endif endif
endif endif
ifndef unsupported_build ifndef SWIFTSHADER_UNSUPPORTED_BUILD
include $(call all-makefiles-under,$(LOCAL_PATH)) include $(call all-makefiles-under,$(LOCAL_PATH))
endif endif
src/Android.mk
...@@ -6,7 +6,7 @@ COMMON_C_INCLUDES += \ ...@@ -6,7 +6,7 @@ COMMON_C_INCLUDES += \
$(LOCAL_PATH)/OpenGL/ \ $(LOCAL_PATH)/OpenGL/ \
$(LOCAL_PATH) $(LOCAL_PATH)
ifdef use_subzero ifdef SWIFTSHADER_USE_SUBZERO
COMMON_C_INCLUDES += \ COMMON_C_INCLUDES += \
$(LOCAL_PATH)/../third_party/subzero/ \ $(LOCAL_PATH)/../third_party/subzero/ \
...@@ -59,7 +59,7 @@ COMMON_SRC_FILES += \ ...@@ -59,7 +59,7 @@ COMMON_SRC_FILES += \
Main/FrameBufferAndroid.cpp \ Main/FrameBufferAndroid.cpp \
Main/SwiftConfig.cpp Main/SwiftConfig.cpp
ifdef use_subzero ifdef SWIFTSHADER_USE_SUBZERO
COMMON_SRC_FILES += \ COMMON_SRC_FILES += \
Reactor/SubzeroReactor.cpp \ Reactor/SubzeroReactor.cpp \
Reactor/Routine.cpp \ Reactor/Routine.cpp \
......
src/OpenGL/libGLES_CM/Android.mk
...@@ -56,7 +56,7 @@ COMMON_C_INCLUDES := \ ...@@ -56,7 +56,7 @@ COMMON_C_INCLUDES := \
$(LOCAL_PATH)/../../Shader/ \ $(LOCAL_PATH)/../../Shader/ \
$(LOCAL_PATH)/../../Main/ $(LOCAL_PATH)/../../Main/
ifdef use_subzero ifdef SWIFTSHADER_USE_SUBZERO
COMMON_STATIC_LIBRARIES := libsubzero COMMON_STATIC_LIBRARIES := libsubzero
else else
COMMON_STATIC_LIBRARIES := libLLVM_swiftshader COMMON_STATIC_LIBRARIES := libLLVM_swiftshader
......
src/OpenGL/libGLESv2/Android.mk
...@@ -65,7 +65,7 @@ COMMON_C_INCLUDES := \ ...@@ -65,7 +65,7 @@ COMMON_C_INCLUDES := \
$(LOCAL_PATH)/../../Shader/ \ $(LOCAL_PATH)/../../Shader/ \
$(LOCAL_PATH)/../../Main/ $(LOCAL_PATH)/../../Main/
ifdef use_subzero ifdef SWIFTSHADER_USE_SUBZERO
COMMON_STATIC_LIBRARIES := libsubzero COMMON_STATIC_LIBRARIES := libsubzero
else else
COMMON_STATIC_LIBRARIES := libLLVM_swiftshader COMMON_STATIC_LIBRARIES := libLLVM_swiftshader
......
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