From cf371cc1f73f2c4ac0dc824d16160648b9b1d952 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 13 Nov 2020 11:48:42 -0800 Subject: Replace android.WriteFile rule with android.WriteFileRule The android.WriteFile rule takes careful escaping to produce the right contents. Wrap it in an android.WriteFileRule that handles the escaping. Test: compare all android.WriteFile outputs Change-Id: If71a5843af47a37ca61714e1a1ebb32d08536c31 --- java/builder.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'java/builder.go') diff --git a/java/builder.go b/java/builder.go index 3043e46db..cd3524542 100644 --- a/java/builder.go +++ b/java/builder.go @@ -572,14 +572,7 @@ func TransformJetifier(ctx android.ModuleContext, outputFile android.WritablePat } func GenerateMainClassManifest(ctx android.ModuleContext, outputFile android.WritablePath, mainClass string) { - ctx.Build(pctx, android.BuildParams{ - Rule: android.WriteFile, - Description: "manifest", - Output: outputFile, - Args: map[string]string{ - "content": "Main-Class: " + mainClass + "\n", - }, - }) + android.WriteFileRule(ctx, outputFile, "Main-Class: "+mainClass+"\n") } func TransformZipAlign(ctx android.ModuleContext, outputFile android.WritablePath, inputFile android.Path) { -- cgit v1.2.3-59-g8ed1b