commit ebfddaa55bfcc981c767ea9e3ddbf2f30b6046d1
author Ying Wang <wangying@google.com> Fri Jul 30 18:37:29 2010 -0700
committer Ying Wang <wangying@google.com> Thu Aug 05 12:54:30 2010 -0700
tree 28ab9d5653c2e722fa33936c98c626664f5333eb
parent 48642604fd6fda55439178df11eba43ff646b357

Now slang supports multiple rs files in a single run.

Change-Id: I26be766614ee3542d76471e3fc55f485ac65bdee

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 1feb5ec..26ab512 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -748,22 +748,17 @@
 ###########################################################
 ## Commands to compile RenderScript
 ###########################################################
-# $(1) the .rs file
-define _compile-one-rs-file
-$(hide) $(SLANG) \
-  --allow-rs-prefix \
-  -o $(PRIVATE_RS_OUTPUT_DIR)/res/raw/$(patsubst %.rs,%.bc,$(notdir $(1))) \
-  -p $(PRIVATE_RS_OUTPUT_DIR)/src \
-  $(1)
-
-endef
 
 define transform-renderscripts-to-java-and-bc
 @echo "RenderScript: $(PRIVATE_MODULE) <= $(PRIVATE_RS_SOURCE_FILES)"
 $(hide) rm -rf $(PRIVATE_RS_OUTPUT_DIR)
 $(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/res/raw
 $(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/src
-$(foreach rs,$(PRIVATE_RS_SOURCE_FILES),$(call _compile-one-rs-file,$(rs)))
+$(hide) $(SLANG) \
+  --allow-rs-prefix \
+  -o $(PRIVATE_RS_OUTPUT_DIR)/res/raw \
+  -p $(PRIVATE_RS_OUTPUT_DIR)/src \
+  $(PRIVATE_RS_SOURCE_FILES)
 $(hide) mkdir -p $(dir $@)
 $(hide) touch $@
 endef