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

Commit f9b4f4b3 authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by Jeffrey Vander Stoep
Browse files

Renderscript: change extension .rs to .rscript 

Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Exempt-From-Owner-Approval: Clean CP
Change-Id: Ibfccb4f52b74f9ac95c373f48d775254ba77288d
Merged-In: Ibfccb4f52b74f9ac95c373f48d775254ba77288d
(cherry picked from commit 480864f1)
parent 0c7f1f6a

core/binary.mk

+3 −3
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ ALL_GENERATED_SOURCES += $(my_generated_sources) 
## Compile RenderScript with reflected C++

####################################################



renderscript_sources := $(filter %.rs %.fs,$(my_src_files))

renderscript_sources := $(filter %.rscript %.fs,$(my_src_files))



ifneq (,$(renderscript_sources))

my_soong_problems += rs
@@ -618,7 +618,7 @@ renderscript_includes := $(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE) 
endif



bc_dep_files := $(addprefix $(renderscript_intermediate)/, \

    $(patsubst %.fs,%.d, $(patsubst %.rs,%.d, $(notdir $(renderscript_sources)))))

    $(patsubst %.fs,%.d, $(patsubst %.rscript,%.d, $(notdir $(renderscript_sources)))))



$(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(renderscript_includes)

$(RenderScript_file_stamp): PRIVATE_RS_CC := $(LOCAL_RENDERSCRIPT_CC)
@@ -636,7 +636,7 @@ $(call include-depfile,$(RenderScript_file_stamp).d,$(RenderScript_file_stamp)) 
LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp)



rs_generated_cpps := $(addprefix \

    $(renderscript_intermediate)/ScriptC_,$(patsubst %.fs,%.cpp, $(patsubst %.rs,%.cpp, \

    $(renderscript_intermediate)/ScriptC_,$(patsubst %.fs,%.cpp, $(patsubst %.rscript,%.cpp, \

    $(notdir $(renderscript_sources)))))



$(call track-src-file-gen,$(renderscript_sources),$(rs_generated_cpps))

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ endef 
###########################################################



define all-renderscript-files-under

$(call find-subdir-files,$(1) \( -name "*.rs" -or -name "*.fs" \) -and -not -name ".*")

$(call find-subdir-files,$(1) \( -name "*.rscript" -or -name "*.fs" \) -and -not -name ".*")

endef



###########################################################

core/java_renderscript.mk

+4 −4
Original line number Diff line number Diff line 
###############################################################

## Renderscript support for java

## Adds rules to convert .rs files to .java and .bc files

## Adds rules to convert .rscript files to .java and .bc files

###############################################################



renderscript_sources := $(filter %.rs,$(LOCAL_SRC_FILES))

LOCAL_SRC_FILES := $(filter-out %.rs,$(LOCAL_SRC_FILES))

renderscript_sources := $(filter %.rscript,$(LOCAL_SRC_FILES))

LOCAL_SRC_FILES := $(filter-out %.rscript,$(LOCAL_SRC_FILES))



rs_generated_res_zip :=

rs_generated_src_jar :=
@@ -67,7 +67,7 @@ ifneq ($(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE),) 
LOCAL_RENDERSCRIPT_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE)

endif



bc_files := $(patsubst %.rs,%.bc, $(notdir $(renderscript_sources)))

bc_files := $(patsubst %.rscript,%.bc, $(notdir $(renderscript_sources)))

bc_dep_files := $(addprefix $(renderscript_intermediate.COMMON)/,$(patsubst %.bc,%.d,$(bc_files)))



$(rs_generated_src_jar): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES)