Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed38fe6f authored by Stephen Hines's avatar Stephen Hines Committed by Android Git Automerger
Browse files

am 0a0cfe95: Merge "Add support for building Filterscript files." into jb-mr1-dev 

* commit '0a0cfe95':
  Add support for building Filterscript files.
parents fc8cec68 0a0cfe95

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java.mk

+3 −2
Original line number Diff line number Diff line
@@ -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)