Make Reactor build stand-alone.
This is accomplished by duplicating files from the Common directory
that Reactor (both with LLVM and Subzero back-end) depended on. They
will be minimized in the next change.
Bug b/115344057
Bug swiftshader:16
Change-Id: I2dc087e91b761cc4402ed8594022551e9246b855
Reviewed-on: https://swiftshader-review.googlesource.com/c/20108
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/Android.mk b/src/Android.mk
index b25ef91..d418b35 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -60,17 +60,22 @@
Main/FrameBufferAndroid.cpp \
Main/SwiftConfig.cpp
+COMMON_SRC_FILES += \
+ Reactor/Routine.cpp \
+ Reactor/Debug.cpp \
+ Reactor/DebugAndroid.cpp \
+ Reactor/Memory.cpp
+
ifdef SWIFTSHADER_USE_SUBZERO
COMMON_SRC_FILES += \
Reactor/SubzeroReactor.cpp \
- Reactor/Routine.cpp \
Reactor/Optimizer.cpp
else
COMMON_SRC_FILES += \
Reactor/LLVMReactor.cpp \
- Reactor/Routine.cpp \
Reactor/LLVMRoutine.cpp \
- Reactor/LLVMRoutineManager.cpp
+ Reactor/LLVMRoutineManager.cpp \
+ Reactor/CPUID.cpp
endif
COMMON_SRC_FILES += \
