commit c963eae72ca502ac847fa03e87644c660b868295
author Stephen Hines <srhines@google.com> Wed Aug 10 13:53:05 2011 -0700
committer Ying Wang <wangying@google.com> Wed Aug 10 17:01:43 2011 -0700
tree 4f621db703027d577cef969a1f84adab1722bc3b
parent b5bd482fc4ae9e4cea04e0f9eb5c678240584148

Update build to properly use prebuilt llvm-rs-cc.

Change-Id: I52a83066b6c08d05d69db4f93631eeaf9c0b41c6

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 4c499ad..466a482 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -801,6 +801,7 @@
   -p $(PRIVATE_RS_OUTPUT_DIR)/src \
   -d $(PRIVATE_RS_OUTPUT_DIR) \
   -a $@ -MD \
+  $(addprefix -target-api , $(PRIVATE_RS_TARGET_API)) \
   $(foreach inc,$(PRIVATE_RS_INCLUDES),$(addprefix -I , $(inc))) \
   $(PRIVATE_RS_SOURCE_FILES)
 #$(hide) $(LLVM_RS_LINK) \

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 5324e7d..677e3de 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -135,6 +135,24 @@
 RenderScript_file_stamp := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/RenderScript.stamp
 renderscript_intermediate := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript
 
+renderscript_target_api :=
+ifneq (,$(LOCAL_SDK_VERSION))
+# Only HC (version 11) should be using the prebuilt RS tools.
+ifeq (11,$(LOCAL_SDK_VERSION))
+ifeq ($(LOCAL_RENDERSCRIPT_CC),)
+LOCAL_RENDERSCRIPT_CC := prebuilt/$(HOST_PREBUILT_TAG)/llvm-rs-cc/llvm-rs-cc
+endif
+endif
+# Set target-api for LOCAL_SDK_VERSIONs other than 11 and current.
+ifneq (,$(filter-out 11 current, $(LOCAL_SDK_VERSION)))
+renderscript_target_api := $(LOCAL_SDK_VERSION)
+endif
+endif  # LOCAL_SDK_VERSION is set
+
+ifeq ($(LOCAL_RENDERSCRIPT_CC),)
+LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC)
+endif
+
 # prepend the RenderScript system include path
 ifneq ($(filter-out current,$(LOCAL_SDK_VERSION)),)
 LOCAL_RENDERSCRIPT_INCLUDES := \
@@ -143,13 +161,9 @@
     $(LOCAL_RENDERSCRIPT_INCLUDES)
 else
 LOCAL_RENDERSCRIPT_INCLUDES := \
-     $(TOPDIR)external/clang/lib/Headers \
-     $(TOPDIR)frameworks/base/libs/rs/scriptc \
-     $(LOCAL_RENDERSCRIPT_INCLUDES)
-endif
-
-ifeq ($(LOCAL_RENDERSCRIPT_CC),)
-LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC)
+    $(TOPDIR)external/clang/lib/Headers \
+    $(TOPDIR)frameworks/base/libs/rs/scriptc \
+    $(LOCAL_RENDERSCRIPT_INCLUDES)
 endif
 
 $(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES)
@@ -158,6 +172,7 @@
 # By putting the generated java files into $(LOCAL_INTERMEDIATE_SOURCE_DIR), they will be
 # automatically found by the java compiling function transform-java-to-classes.jar.
 $(RenderScript_file_stamp): PRIVATE_RS_OUTPUT_DIR := $(renderscript_intermediate)
+$(RenderScript_file_stamp): PRIVATE_RS_TARGET_API := $(renderscript_target_api)
 $(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIPT_CC)
 	$(transform-renderscripts-to-java-and-bc)