Merge "RenderScript-specific build updates for LLVM rebase"
am: 9e73fb6332
Change-Id: Ib0154409699b27ba1e651aefc5559d094aa53635
This commit is contained in:
commit
97f259ec41
7 changed files with 7 additions and 7 deletions
|
@ -1,4 +1,4 @@
|
|||
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := renderscript32-linux-androideabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
|
||||
$(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
RS_TRIPLE := aarch64-linux-android
|
||||
RS_TRIPLE := renderscript64-linux-android
|
||||
RS_TRIPLE_CFLAGS :=
|
||||
RS_COMPAT_TRIPLE := aarch64-linux-android
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := renderscript32-linux-androideabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
|
||||
RS_COMPAT_TRIPLE := mipsel-linux-android
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
RS_TRIPLE := aarch64-linux-android
|
||||
RS_TRIPLE := renderscript64-linux-android
|
||||
RS_TRIPLE_CFLAGS :=
|
||||
RS_COMPAT_TRIPLE := mips64el-linux-android
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := renderscript32-linux-androideabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__
|
||||
$(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := i686-linux-android
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
RS_TRIPLE := aarch64-linux-android
|
||||
RS_TRIPLE := renderscript64-linux-android
|
||||
RS_TRIPLE_CFLAGS := -D__x86_64__
|
||||
RS_COMPAT_TRIPLE := x86_64-linux-android
|
||||
|
||||
|
|
|
@ -15,7 +15,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 := clang-2812033
|
||||
RS_LLVM_PREBUILTS_VERSION := clang-3289846
|
||||
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)
|
||||
|
|
Loading…
Reference in a new issue