commit cf53e0e0aaf569d7e76472e2958dca5a44f45df2
author Tim Murray <timmurray@google.com> Wed Apr 30 21:54:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 30 21:54:08 2014 +0000
tree 06a6281754faff5743e1a3f7871449e7fa87c1b7
parent 7d26e97e7f7ecc8ee7af373d5a5e3c96d317c910
parent 27fe940676b568bb9a0af889028495fab73853f2

am 27fe9406: am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."

* commit '27fe940676b568bb9a0af889028495fab73853f2':
  Remove tblgen and clang-tblgen from prebuilts.

core/clang/config.mk

diff --git a/core/clang/config.mk b/core/clang/config.mk
index a79a558..b8f76f2 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -11,10 +11,11 @@
 
 CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)
 CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX)
-CLANG_TBLGEN := $(LLVM_PREBUILTS_PATH)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)
 LLVM_AS := $(LLVM_PREBUILTS_PATH)/llvm-as$(BUILD_EXECUTABLE_SUFFIX)
 LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX)
-TBLGEN := $(LLVM_PREBUILTS_PATH)/tblgen$(BUILD_EXECUTABLE_SUFFIX)
+
+CLANG_TBLGEN := $(HOST_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)
+TBLGEN := $(HOST_OUT_EXECUTABLES)/tblgen$(BUILD_EXECUTABLE_SUFFIX)
 
 
 # Clang flags for all host or target rules