Merge "Update RS to use latest Clang-2812033 prebuilts as well."

am: fa4ff9defd

* commit 'fa4ff9defd768b43a030939cd4dc28ed281ae8b7':
  Update RS to use latest Clang-2812033 prebuilts as well.

Change-Id: Ic85416306e3f41b26c130b04125437ebccf8af5c
This commit is contained in:
Stephen Hines
2016-05-04 21:25:18 +00:00
committed by android-build-merger

View File

@@ -14,7 +14,7 @@ LLVM_TBLGEN := $(BUILD_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX)
# RenderScript-specific tools # RenderScript-specific tools
# These are tied to the version of LLVM directly in external/, so they might # 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. # trail the host prebuilts being used for the rest of the build process.
RS_LLVM_PREBUILTS_VERSION := clang-2690385 RS_LLVM_PREBUILTS_VERSION := clang-2812033
RS_LLVM_PREBUILTS_BASE := prebuilts/clang/host RS_LLVM_PREBUILTS_BASE := prebuilts/clang/host
RS_LLVM_PREBUILTS_PATH := $(RS_LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(RS_LLVM_PREBUILTS_VERSION)/bin 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) RS_CLANG := $(RS_LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)