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

Merge "Mark generated renderscript header files as implicit outputs" am: bfe65a32bb

Browse Source 
am: 3e7c9ec5b3

Change-Id: I0dc4a12032a175eea3afbeef8ae04c526f479f2c
This commit is contained in:
Colin Cross
2018-03-20 08:22:50 +00:00
committed by android-build-merger
parent 155ee3fcf9 3e7c9ec5b3
commit 61ea4cf419
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cc/rs.go
View File

@@ -49,6 +49,11 @@ func rsGeneratedCppFile(ctx android.ModuleContext, rsFile android.Path) android.
return android.PathForModuleGen(ctx, "rs", "ScriptC_"+fileName+".cpp") return android.PathForModuleGen(ctx, "rs", "ScriptC_"+fileName+".cpp")
} }
func rsGeneratedHFile(ctx android.ModuleContext, rsFile android.Path) android.WritablePath {
fileName := strings.TrimSuffix(rsFile.Base(), rsFile.Ext())
return android.PathForModuleGen(ctx, "rs", "ScriptC_"+fileName+".h")
}
func rsGeneratedDepFile(ctx android.ModuleContext, rsFile android.Path) android.WritablePath { func rsGeneratedDepFile(ctx android.ModuleContext, rsFile android.Path) android.WritablePath {
fileName := strings.TrimSuffix(rsFile.Base(), rsFile.Ext()) fileName := strings.TrimSuffix(rsFile.Base(), rsFile.Ext())
return android.PathForModuleGen(ctx, "rs", fileName+".d") return android.PathForModuleGen(ctx, "rs", fileName+".d")
@@ -56,18 +61,20 @@ func rsGeneratedDepFile(ctx android.ModuleContext, rsFile android.Path) android.
func rsGenerateCpp(ctx android.ModuleContext, rsFiles android.Paths, rsFlags string) android.Paths { func rsGenerateCpp(ctx android.ModuleContext, rsFiles android.Paths, rsFlags string) android.Paths {
stampFile := android.PathForModuleGen(ctx, "rs", "rs.stamp") stampFile := android.PathForModuleGen(ctx, "rs", "rs.stamp")
depFiles := make(android.WritablePaths, len(rsFiles)) depFiles := make(android.WritablePaths, 0, len(rsFiles))
cppFiles := make(android.WritablePaths, len(rsFiles)) genFiles := make(android.WritablePaths, 0, 2*len(rsFiles))
for i, rsFile := range rsFiles { for _, rsFile := range rsFiles {
depFiles[i] = rsGeneratedDepFile(ctx, rsFile) depFiles = append(depFiles, rsGeneratedDepFile(ctx, rsFile))
cppFiles[i] = rsGeneratedCppFile(ctx, rsFile) genFiles = append(genFiles,
rsGeneratedCppFile(ctx, rsFile),
rsGeneratedHFile(ctx, rsFile))
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: rsCpp, Rule: rsCpp,
Description: "llvm-rs-cc", Description: "llvm-rs-cc",
Output: stampFile, Output: stampFile,
ImplicitOutputs: cppFiles, ImplicitOutputs: genFiles,
Inputs: rsFiles, Inputs: rsFiles,
Args: map[string]string{ Args: map[string]string{
"rsFlags": rsFlags, "rsFlags": rsFlags,