commit d26375733992298edc036652d25170e1cd7cbd49
author Stephen Hines <srhines@google.com> Thu Oct 11 22:08:57 2012 -0700
committer Stephen Hines <srhines@google.com> Thu Oct 11 22:08:57 2012 -0700
tree 59b5a3e8a0328ab9cff6e31ade50b819aeb2e857
parent 9f81546a25b9228a0ccd55d16478d9a0beed5a85
parent ed38fe6fb88955094e3f408a023fdadbd9854f27

resolved conflicts for merge of ed38fe6f to jb-mr1-dev-plus-aosp

Change-Id: If699b3ccf1f3befd4df881e3eef6b90dd7c505bf

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index a6584f4..3ae56aa 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -269,7 +269,7 @@
 define all-renderscript-files-under
 $(patsubst ./%,%, \
   $(shell cd $(LOCAL_PATH) ; \
-          find -L $(1) -name "*.rs" -and -not -name ".*") \
+          find -L $(1) \( -name "*.rs" -or -name "*.fs" \) -and -not -name ".*") \
   )
 endef
 

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 66f9a02..99e67f4 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -133,8 +133,9 @@
 
 ###############################################################
 ## .rs files: RenderScript sources to .java files and .bc files
+## .fs files: Filterscript sources to .java files and .bc files
 ###############################################################
-renderscript_sources := $(filter %.rs,$(LOCAL_SRC_FILES))
+renderscript_sources := $(filter %.rs %.fs,$(LOCAL_SRC_FILES))
 # Because names of the java files from RenderScript are unknown until the
 # .rs file(s) are compiled, we have to depend on a timestamp file.
 RenderScript_file_stamp :=
@@ -196,7 +197,7 @@
 
 # include the dependency files (.d) generated by llvm-rs-cc.
 renderscript_generated_dep_files := $(addprefix $(renderscript_intermediate)/, \
-    $(patsubst %.rs,%.d, $(notdir $(renderscript_sources))))
+    $(patsubst %.fs,%.d, $(patsubst %.rs,%.d, $(notdir $(renderscript_sources)))))
 -include $(renderscript_generated_dep_files)
 
 LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp)