diff options
| author | 2020-11-16 23:11:41 +0000 | |
|---|---|---|
| committer | 2020-11-16 23:11:41 +0000 | |
| commit | 1af783fae74715bcf1a94733bd75b2e6cc688e8c (patch) | |
| tree | 4fbc5ddf90574db61a533fd1d3e3b227ced2dd53 /java | |
| parent | f15c0558bfdd87b2b04f6f074142bd9b35ee1011 (diff) | |
| parent | cf371cc1f73f2c4ac0dc824d16160648b9b1d952 (diff) | |
Merge "Replace android.WriteFile rule with android.WriteFileRule"
Diffstat (limited to 'java')
| -rw-r--r-- | java/builder.go | 9 | ||||
| -rw-r--r-- | java/dexpreopt_bootjars.go | 18 |
2 files changed, 4 insertions, 23 deletions
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) { diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 629d34f25..f9975ba5c 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -651,14 +651,8 @@ func updatableBcpPackagesRule(ctx android.SingletonContext, image *bootImageConf updatableBcpPackagesName := "updatable-bcp-packages.txt" updatableBcpPackages := image.dir.Join(ctx, updatableBcpPackagesName) - ctx.Build(pctx, android.BuildParams{ - Rule: android.WriteFile, - Output: updatableBcpPackages, - Args: map[string]string{ - // WriteFile automatically adds the last end-of-line. - "content": strings.Join(updatablePackages, "\\n"), - }, - }) + // WriteFileRule automatically adds the last end-of-line. + android.WriteFileRule(ctx, updatableBcpPackages, strings.Join(updatablePackages, "\n")) rule := android.NewRuleBuilder() rule.MissingDeps(missingDeps) @@ -720,13 +714,7 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) { func writeGlobalConfigForMake(ctx android.SingletonContext, path android.WritablePath) { data := dexpreopt.GetGlobalConfigRawData(ctx) - ctx.Build(pctx, android.BuildParams{ - Rule: android.WriteFile, - Output: path, - Args: map[string]string{ - "content": string(data), - }, - }) + android.WriteFileRule(ctx, path, string(data)) } // Export paths for default boot image to Make |