Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27b18f5c authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by Stephen Hines
Browse files

Update RenderScript build rules for rebase to LLVM r256229 

http://b/26987366

- Use clang-2690385 to build RenderScript toolchain.
- Use armv7-linux-androideabi as the triple used to build RenderScript
  runtime libraries.

(cherry picked from commit 41f4b242)

Change-Id: I50751f410a2f7c83532cec9b96c50d9afe1224c1
parent 2ae244c5

core/clang/TARGET_arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \ 
  $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS)) \

  $(CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS)



$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi

$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi

$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=

$(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi

core/clang/TARGET_mips.mk

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \ 
  $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS)) \

  $(CLANG_CONFIG_mips_TARGET_EXTRA_LDFLAGS)



$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi

$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi

$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=

RS_COMPAT_TRIPLE := mipsel-linux-android

core/clang/TARGET_x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \ 
  $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS)) \

  $(CLANG_CONFIG_x86_TARGET_EXTRA_LDFLAGS)



$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi

$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi

$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__

$(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := i686-linux-android

core/clang/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LLVM_TBLGEN := $(BUILD_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX) 
# RenderScript-specific tools

# These are tied to the version of LLVM directly in external/, so they might

# trail the host prebuilts being used for the rest of the build process.

RS_LLVM_PREBUILTS_VERSION := 3.8

RS_LLVM_PREBUILTS_VERSION := clang-2690385

RS_LLVM_PREBUILTS_BASE := prebuilts/clang/host

RS_LLVM_PREBUILTS_PATH := $(RS_LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(RS_LLVM_PREBUILTS_VERSION)/bin

RS_CLANG := $(RS_LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)