commit f7b32bfe41406daf0785b7451efdbbb9b7bbba7a
author Shih-wei Liao <sliao@google.com> Mon Oct 11 10:36:42 2010 -0700
committer Shih-wei Liao <sliao@google.com> Mon Oct 11 10:36:42 2010 -0700
tree dacf3ca546ad7dbed06d2312ab5be7e0e38ee289
parent 8921ea698254bacb87e0cddc1ef3508074b8cfe4

Enable LLVM_RS_LINK. No longer forking an LLVM linker inside llvm-rs-cc.

Change-Id: I2ebc6ec759daf36d1e77fa8e30147ab8e40b44fc

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 85cc761..c03f44a 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -222,6 +222,7 @@
 PROGUARD := external/proguard/bin/proguard.sh
 JAVATAGS := build/tools/java-event-log-tags.py
 LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)
+LLVM_RS_LINK := $(HOST_OUT_EXECUTABLES)/llvm-rs-link$(HOST_EXECUTABLE_SUFFIX)
 DEXOPT := $(HOST_OUT_EXECUTABLES)/dexopt$(HOST_EXECUTABLE_SUFFIX)
 DEXPREOPT := dalvik/tools/dex-preopt
 

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 05e7c56..28ac0bc 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -774,6 +774,8 @@
   -a $@ -MD \
   $(foreach inc,$(PRIVATE_RS_INCLUDES),$(addprefix -I , $(inc))) \
   $(PRIVATE_RS_SOURCE_FILES)
+$(hide) $(LLVM_RS_LINK) \
+  $(PRIVATE_RS_OUTPUR_DIR)/res/raw/*.bc
 $(hide) mkdir -p $(dir $@)
 $(hide) touch $@
 endef