diff options
| author | Stephen Hines <srhines@google.com> | 2012-10-11 17:27:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-11 17:27:30 -0700 |
| commit | ed38fe6fb88955094e3f408a023fdadbd9854f27 (patch) | |
| tree | c43ba09c04a8068798e71853b871f60138e17049 | |
| parent | fc8cec68facce8190d3a170d2accf9b16ce05aaa (diff) | |
| parent | 0a0cfe95ac50457fe5539f913b372880ef841880 (diff) | |
| download | build-ed38fe6fb88955094e3f408a023fdadbd9854f27.zip build-ed38fe6fb88955094e3f408a023fdadbd9854f27.tar.gz build-ed38fe6fb88955094e3f408a023fdadbd9854f27.tar.bz2 | |
am 0a0cfe95: Merge "Add support for building Filterscript files." into jb-mr1-dev
* commit '0a0cfe95ac50457fe5539f913b372880ef841880':
Add support for building Filterscript files.
| -rw-r--r-- | core/definitions.mk | 2 | ||||
| -rw-r--r-- | core/java.mk | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 7336c74..06db960 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -269,7 +269,7 @@ endef define all-renderscript-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.rs" -and -not -name ".*") \ + find $(1) \( -name "*.rs" -or -name "*.fs" \) -and -not -name ".*") \ ) endef 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 @@ LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src ############################################################### ## .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 @@ $(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIP # 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) |