commit d632e6d54e5a368f87af41066a6b7cb40191e1f7
author Ben Clayton <bclayton@google.com> Fri Apr 12 16:51:47 2019 -0400
committer Ben Clayton <bclayton@google.com> Tue Apr 16 15:00:51 2019 +0000
tree 46dea06514899df26fb0d203da9a3497bfc94484
parent 25e964896e36b8dec16f242d32d9aac409f4896c

Android: Always use LLVM 7, delete build files for LLVM 3

C++ 11 is in heavy use by SwiftShader now, so SwiftShader is now unsupported for Android versions earlier than M.

Bug: b/130460252
Bug: b/130343040
Bug: b/130361288
Change-Id: Idfb64c3fa82325641cc2170f494260c1b5b1eeb4
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28988
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: Lingfeng Yang <lfy@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index 1cc9690..f7d5eaa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,47 +17,25 @@
 LOCAL_PATH := $(call my-dir)
 swiftshader_root := $(LOCAL_PATH)
 
-# Default LLVM version for SwiftShader's JIT compiler (Reactor).
-REACTOR_LLVM_VERSION ?= 7
+# LLVM version for SwiftShader's JIT compiler (Reactor).
+REACTOR_LLVM_VERSION := 7
 
 # Subzero is an alternative JIT compiler. It is smaller and generally slower.
 REACTOR_USE_SUBZERO := false
 
-ifeq ($(REACTOR_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))
-REACTOR_USE_SUBZERO := true
-endif
-endif
-
-# Subzero and LLVM 7.0 require C++11.
+# SwiftShader requires C++11.
 # Full C++11 support is only available from Marshmallow and up.
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
-# Fall back to LLVM 3.0.
-REACTOR_USE_SUBZERO := false
-REACTOR_LLVM_VERSION := 3
+swiftshader_unsupported_build := true
 endif
 
 # Check whether $(TARGET_ARCH) is supported.
-ifeq ($(REACTOR_LLVM_VERSION),3)
-ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm))
-swiftshader_unsupported_build := true
-endif
-endif
-
-ifeq ($(REACTOR_LLVM_VERSION),7)
 ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm arm64))
 swiftshader_unsupported_build := true
 endif
-endif
 
 ifneq ($(swiftshader_unsupported_build),true)
 include $(swiftshader_root)/src/Android.mk
 include $(swiftshader_root)/tests/GLESUnitTests/Android.mk
-ifeq ($(REACTOR_LLVM_VERSION),3)
-include $(swiftshader_root)/third_party/LLVM/Android.mk
-else
 include $(swiftshader_root)/third_party/llvm-7.0/Android.mk
 endif
-endif