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

Commit 77f8360e authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Update aconfig storage generation function" into main

parents b30dee93 cc36feb0
Loading
Loading
Loading
Loading
+5 −2
Original line number Original line Diff line number Diff line
@@ -52,6 +52,8 @@ func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder *
	sb.WriteString(aconfigToolPath.String())
	sb.WriteString(aconfigToolPath.String())
	sb.WriteString(" dump-cache --dedup --format protobuf --out ")
	sb.WriteString(" dump-cache --dedup --format protobuf --out ")
	sb.WriteString(installAconfigFlagsPath.String())
	sb.WriteString(installAconfigFlagsPath.String())
	sb.WriteString(" --filter container:")
	sb.WriteString(f.PartitionType())
	sb.WriteString(" \\\n")
	sb.WriteString(" \\\n")
	sb.WriteString(sbCaches.String())
	sb.WriteString(sbCaches.String())
	cmd.ImplicitOutput(installAconfigFlagsPath)
	cmd.ImplicitOutput(installAconfigFlagsPath)
@@ -71,8 +73,9 @@ func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder *
		sb.WriteString(fileType)
		sb.WriteString(fileType)
		sb.WriteString(" --out ")
		sb.WriteString(" --out ")
		sb.WriteString(outputPath.String())
		sb.WriteString(outputPath.String())
		sb.WriteString(" \\\n")
		sb.WriteString(" --cache ")
		sb.WriteString(sbCaches.String())
		sb.WriteString(installAconfigFlagsPath.String())
		sb.WriteRune('\n')
		cmd.ImplicitOutput(outputPath)
		cmd.ImplicitOutput(outputPath)
		f.appendToEntry(ctx, outputPath)
		f.appendToEntry(ctx, outputPath)
	}
	}