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

Renderscript: rename .rs extension to .rscript

Browse Source 
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: I0458009b8bb64a012fece364835d5b78d52e15e9
Merged-In: I0458009b8bb64a012fece364835d5b78d52e15e9
(cherry picked from commit 41ce1c0d82)
(cherry picked from commit a50b16974a)
This commit is contained in:
Jeff Vander Stoep
2019-07-15 19:08:37 -07:00
committed by Jeffrey Vander Stoep
parent 4a3c9cd600
commit 8b2bd15423
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/compiler.go
View File

@@ -485,7 +485,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
"-I"+android.PathForModuleGen(ctx, "aidl").String()) "-I"+android.PathForModuleGen(ctx, "aidl").String())
} }
if compiler.hasSrcExt(".rs") || compiler.hasSrcExt(".fs") { if compiler.hasSrcExt(".rscript") || compiler.hasSrcExt(".fs") {
flags = rsFlags(ctx, flags, &compiler.Properties) flags = rsFlags(ctx, flags, &compiler.Properties)
} }

2
cc/gen.go
View File

@@ -238,7 +238,7 @@ func genSources(ctx android.ModuleContext, srcFiles android.Paths,
depFile := android.GenPathWithExt(ctx, "aidl", srcFile, "cpp.d") depFile := android.GenPathWithExt(ctx, "aidl", srcFile, "cpp.d")
srcFiles[i] = cppFile srcFiles[i] = cppFile
deps = append(deps, genAidl(ctx, aidlRule, srcFile, cppFile, depFile, buildFlags.aidlFlags)...) deps = append(deps, genAidl(ctx, aidlRule, srcFile, cppFile, depFile, buildFlags.aidlFlags)...)
case ".rs", ".fs": case ".rscript", ".fs":
cppFile := rsGeneratedCppFile(ctx, srcFile) cppFile := rsGeneratedCppFile(ctx, srcFile)
rsFiles = append(rsFiles, srcFiles[i]) rsFiles = append(rsFiles, srcFiles[i])
srcFiles[i] = cppFile srcFiles[i] = cppFile

2
cc/rs.go
View File

@@ -51,7 +51,7 @@ var (
"depFiles", "outDir", "rsFlags", "stampFile") "depFiles", "outDir", "rsFlags", "stampFile")
) )
// Takes a path to a .rs or .fs file, and returns a path to a generated ScriptC_*.cpp file // Takes a path to a .rscript or .fs file, and returns a path to a generated ScriptC_*.cpp file
// This has to match the logic in llvm-rs-cc in DetermineOutputFile. // This has to match the logic in llvm-rs-cc in DetermineOutputFile.
func rsGeneratedCppFile(ctx android.ModuleContext, rsFile android.Path) android.WritablePath { func rsGeneratedCppFile(ctx android.ModuleContext, rsFile android.Path) android.WritablePath {
fileName := strings.TrimSuffix(rsFile.Base(), rsFile.Ext()) fileName := strings.TrimSuffix(rsFile.Base(), rsFile.Ext())