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

Merge "Renderscript: rename .rs extension to .rscript"

Browse Source
This commit is contained in:
Jeffrey Vander Stoep
2019-07-18 02:02:00 +00:00
committed by Gerrit Code Review
parent ed1f4def5c d612627169
commit 38aaf75e44
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())
}
if compiler.hasSrcExt(".rs") || compiler.hasSrcExt(".fs") {
if compiler.hasSrcExt(".rscript") || compiler.hasSrcExt(".fs") {
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")
srcFiles[i] = cppFile
deps = append(deps, genAidl(ctx, aidlRule, srcFile, cppFile, depFile, buildFlags.aidlFlags)...)
case ".rs", ".fs":
case ".rscript", ".fs":
cppFile := rsGeneratedCppFile(ctx, srcFile)
rsFiles = append(rsFiles, srcFiles[i])
srcFiles[i] = cppFile

2
cc/rs.go
View File

@@ -51,7 +51,7 @@ var (
"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.
func rsGeneratedCppFile(ctx android.ModuleContext, rsFile android.Path) android.WritablePath {
fileName := strings.TrimSuffix(rsFile.Base(), rsFile.Ext())