Skip to content

S
swiftshader
Commit 6c9fb0e6 by Logan Chien
Options

Fix REACTOR_USE_SUBZERO flag

This commit fixes REACTOR_USE_SUBZERO flag. The commit fde88d96 sets REACTOR_USE_SUBZERO to `false` to disable the SubZero backend. However, other Android.mk uses `ifdef` to check whether the SubZero backend is enabled. As a result, the SubZero backend is always selected because both `REACTOR_USE_SUBZERO := true` and `REACTOR_USE_SUBZERO := false` are considered as defined. This commit replaces `ifdef REACTOR_USE_SUBZERO` with `ifeq ($(REACTOR_USE_SUBZERO),true)` to fix the problem. Bug: b/115344057 Test: Build libEGL_swiftshader and libGLES_swiftshader for Android Change-Id: I83f2dc5018857c630a71a1b7eae636983283783a Reviewed-on: https://swiftshader-review.googlesource.com/c/25528Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarChris Forbes <chrisforbes@google.com> Reviewed-by: 's avatarCody Schuffelen <schuffelen@google.com> Tested-by: 's avatarLogan Chien <loganchien@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent 1bc7ee95
Showing with 4 additions and 4 deletions
src/Android.mk
...@@ -7,7 +7,7 @@ COMMON_C_INCLUDES += \ ...@@ -7,7 +7,7 @@ COMMON_C_INCLUDES += \
$(LOCAL_PATH)/OpenGL/ \ $(LOCAL_PATH)/OpenGL/ \
$(LOCAL_PATH) $(LOCAL_PATH)
ifdef REACTOR_USE_SUBZERO ifeq ($(REACTOR_USE_SUBZERO),true)
COMMON_C_INCLUDES += \ COMMON_C_INCLUDES += \
$(LOCAL_PATH)/../third_party/subzero/ \ $(LOCAL_PATH)/../third_party/subzero/ \
...@@ -66,7 +66,7 @@ COMMON_SRC_FILES += \ ...@@ -66,7 +66,7 @@ COMMON_SRC_FILES += \
Reactor/DebugAndroid.cpp \ Reactor/DebugAndroid.cpp \
Reactor/ExecutableMemory.cpp Reactor/ExecutableMemory.cpp
ifdef REACTOR_USE_SUBZERO ifeq ($(REACTOR_USE_SUBZERO),true)
COMMON_SRC_FILES += \ COMMON_SRC_FILES += \
Reactor/SubzeroReactor.cpp \ Reactor/SubzeroReactor.cpp \
Reactor/Optimizer.cpp Reactor/Optimizer.cpp
......
src/OpenGL/libGLES_CM/Android.mk
...@@ -58,7 +58,7 @@ COMMON_C_INCLUDES := \ ...@@ -58,7 +58,7 @@ COMMON_C_INCLUDES := \
$(LOCAL_PATH)/../../Shader/ \ $(LOCAL_PATH)/../../Shader/ \
$(LOCAL_PATH)/../../Main/ $(LOCAL_PATH)/../../Main/
ifdef REACTOR_USE_SUBZERO ifeq ($(REACTOR_USE_SUBZERO),true)
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
...@@ -67,7 +67,7 @@ COMMON_C_INCLUDES := \ ...@@ -67,7 +67,7 @@ COMMON_C_INCLUDES := \
$(LOCAL_PATH)/../../Shader/ \ $(LOCAL_PATH)/../../Shader/ \
$(LOCAL_PATH)/../../Main/ $(LOCAL_PATH)/../../Main/
ifdef REACTOR_USE_SUBZERO ifeq ($(REACTOR_USE_SUBZERO),true)
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