From 2ecc8b712b08e895a41f4f1852b35ac8b744c4b8 Mon Sep 17 00:00:00 2001
From: Logan Chien <loganchien@google.com>
Date: Mon, 10 Sep 2018 22:14:20 +0800
Subject: [PATCH] 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/20588
Tested-by: Logan Chien <loganchien@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
---
 Android.mk                       | 12 ++++++------
 src/Android.mk                   |  4 ++--
 src/OpenGL/libGLES_CM/Android.mk |  2 +-
 src/OpenGL/libGLESv2/Android.mk  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Android.mk b/Android.mk
index 893ca07c3..9601daafb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,13 +24,13 @@ ifeq ($(SWIFTSHADER_LLVM_VERSION),3)
 # Reactor with LLVM 3.0 doesn't support ARM.  Use Subzero as the Reactor JIT
 # back-end on ARM.
 ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm))
-use_subzero := true
+SWIFTSHADER_USE_SUBZERO := true
 endif
 endif
 
 
 # Check whether SwiftShader requires full C++ 11 support.
-ifdef use_subzero
+ifdef SWIFTSHADER_USE_SUBZERO
 SWIFTSHADER_REQUIRES_CXX11 := true
 endif
 
@@ -41,7 +41,7 @@ endif
 ifeq ($(SWIFTSHADER_REQUIRES_CXX11),true)
 # Full C++ 11 support is only available from Marshmallow and up.
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
-unsupported_build := true
+SWIFTSHADER_UNSUPPORTED_BUILD := true
 endif
 endif
 
@@ -49,17 +49,17 @@ endif
 # Check whether $(TARGET_ARCH) is supported.
 ifeq ($(SWIFTSHADER_LLVM_VERSION),3)
 ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm))
-unsupported_build := true
+SWIFTSHADER_UNSUPPORTED_BUILD := true
 endif
 endif
 
 ifeq ($(SWIFTSHADER_LLVM_VERSION),7)
 ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm arm64))
-unsupported_build := true
+SWIFTSHADER_UNSUPPORTED_BUILD := true
 endif
 endif
 
 
-ifndef unsupported_build
+ifndef SWIFTSHADER_UNSUPPORTED_BUILD
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
diff --git a/src/Android.mk b/src/Android.mk
index 8559689d0..369592640 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -6,7 +6,7 @@ COMMON_C_INCLUDES += \
 	$(LOCAL_PATH)/OpenGL/ \
 	$(LOCAL_PATH)
 
-ifdef use_subzero
+ifdef SWIFTSHADER_USE_SUBZERO
 
 COMMON_C_INCLUDES += \
 	$(LOCAL_PATH)/../third_party/subzero/ \
@@ -59,7 +59,7 @@ COMMON_SRC_FILES += \
 	Main/FrameBufferAndroid.cpp \
 	Main/SwiftConfig.cpp
 
-ifdef use_subzero
+ifdef SWIFTSHADER_USE_SUBZERO
 COMMON_SRC_FILES += \
 	Reactor/SubzeroReactor.cpp \
 	Reactor/Routine.cpp \
diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index 30be9ba17..624b350ed 100644
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -56,7 +56,7 @@ COMMON_C_INCLUDES := \
 	$(LOCAL_PATH)/../../Shader/ \
 	$(LOCAL_PATH)/../../Main/
 
-ifdef use_subzero
+ifdef SWIFTSHADER_USE_SUBZERO
 COMMON_STATIC_LIBRARIES := libsubzero
 else
 COMMON_STATIC_LIBRARIES := libLLVM_swiftshader
diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index b4b98fe9e..f92358bb4 100644
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -65,7 +65,7 @@ COMMON_C_INCLUDES := \
 	$(LOCAL_PATH)/../../Shader/ \
 	$(LOCAL_PATH)/../../Main/
 
-ifdef use_subzero
+ifdef SWIFTSHADER_USE_SUBZERO
 COMMON_STATIC_LIBRARIES := libsubzero
 else
 COMMON_STATIC_LIBRARIES := libLLVM_swiftshader
-- 
2.11.0