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

Commit 61ea4cf4 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

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

am: 3e7c9ec5

Change-Id: I0dc4a12032a175eea3afbeef8ae04c526f479f2c
parents 155ee3fc 3e7c9ec5

cc/rs.go

+13 −6
Original line number Original line Diff line number Diff line
@@ -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,