From 6aad6a769d20eb0f2102c7786e2c80fac4a842fc Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Tue, 25 Sep 2018 17:59:20 +0800 Subject: [PATCH] Use lower case for internal Makefile variables This commit switches several internal (implied) Makefile variables to lower cases. This follows the variable naming convention recommended by GNU Makefile Manual. Change-Id: I79819ef0cfd3828107dab665118f1511ef8a8337 Reviewed-on: https://swiftshader-review.googlesource.com/20848 Reviewed-by: Nicolas Capens Tested-by: Logan Chien --- Android.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Android.mk b/Android.mk index 9601daafb..4eef35800 100644 --- a/Android.mk +++ b/Android.mk @@ -31,17 +31,17 @@ endif # Check whether SwiftShader requires full C++ 11 support. ifdef SWIFTSHADER_USE_SUBZERO -SWIFTSHADER_REQUIRES_CXX11 := true +swiftshader_requires_cxx11 := true endif ifeq ($(SWIFTSHADER_LLVM_VERSION),7) -SWIFTSHADER_REQUIRES_CXX11 := true +swiftshader_requires_cxx11 := true endif -ifeq ($(SWIFTSHADER_REQUIRES_CXX11),true) +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) -SWIFTSHADER_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)) -SWIFTSHADER_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)) -SWIFTSHADER_UNSUPPORTED_BUILD := true +swiftshader_unsupported_build := true endif endif -ifndef SWIFTSHADER_UNSUPPORTED_BUILD +ifndef swiftshader_unsupported_build include $(call all-makefiles-under,$(LOCAL_PATH)) endif -- 2.11.0