StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: If699b3ccf1f3befd4df881e3eef6b90dd7c505bf
This commit is contained in:
Stephen Hines
2012-10-11 22:08:57 -07:00
parent 9f81546a25 ed38fe6fb8
commit d263757339
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/definitions.mk
View File

@@ -269,7 +269,7 @@ endef
define all-renderscript-files-under define all-renderscript-files-under
$(patsubst ./%,%, \ $(patsubst ./%,%, \
$(shell cd $(LOCAL_PATH) ; \ $(shell cd $(LOCAL_PATH) ; \
find -L $(1) -name "*.rs" -and -not -name ".*") \ find -L $(1) \( -name "*.rs" -or -name "*.fs" \) -and -not -name ".*") \
) )
endef endef

5
core/java.mk
View File

@@ -133,8 +133,9 @@ LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src
############################################################### ###############################################################
## .rs files: RenderScript sources to .java files and .bc files ## .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 # 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. # .rs file(s) are compiled, we have to depend on a timestamp file.
RenderScript_file_stamp := 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. # include the dependency files (.d) generated by llvm-rs-cc.
renderscript_generated_dep_files := $(addprefix $(renderscript_intermediate)/, \ 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) -include $(renderscript_generated_dep_files)
LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp) LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp)