commit f417d9d7404f457c915f19ff1b4e73c8c56c809e
author Nicolas Capens <capn@google.com> Wed Oct 10 10:49:30 2018 -0400
committer Nicolas Capens <nicolascapens@google.com> Fri Oct 12 18:19:15 2018 +0000
tree fc05ad10dd02899e520e17eb05717abcfb310851
parent 1a3ce872b97e13478f1f25f36ef95124f52d7b87

Rename SWIFTSHADER_LLVM_VERSION to REACTOR_LLVM_VERSION.

Bug b/115344057
Bug swiftshader:16

Change-Id: I0e7d49cb5f66cef7d8ccd80506deeae8aab1824c
Reviewed-on: https://swiftshader-review.googlesource.com/c/21389
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index f9b30e0..9e06bea 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -17,7 +17,7 @@
 
 else
 
-ifeq ($(SWIFTSHADER_LLVM_VERSION),3)
+ifeq ($(REACTOR_LLVM_VERSION),3)
 COMMON_C_INCLUDES += \
 	$(LOCAL_PATH)/../third_party/LLVM/include
 else
@@ -156,7 +156,7 @@
 endif
 
 # Common LLVM defines
-COMMON_CFLAGS += -DSWIFTSHADER_LLVM_VERSION=$(SWIFTSHADER_LLVM_VERSION)
+COMMON_CFLAGS += -DREACTOR_LLVM_VERSION=$(REACTOR_LLVM_VERSION)
 
 # Common Subzero defines
 COMMON_CFLAGS += -DALLOW_DUMP=0 -DALLOW_TIMERS=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_MINIMAL_BUILD=0 -DALLOW_WASM=0 -DICE_THREAD_LOCAL_HACK=1