diff options
| author | Colin Cross <ccross@android.com> | 2020-12-03 20:07:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-03 20:07:30 +0000 |
| commit | 897a5ad50745c0da2b2c13a74cc501c5bab89388 (patch) | |
| tree | 15e7daf7e326181c8b12b1b1d3252502860a8021 /java/java.go | |
| parent | 47f0e63ba07d629152b6831213c726fba96ccd85 (diff) | |
| parent | f1a035e6be35d5678ce2e86bf3bc83fd5e4b4dc2 (diff) | |
Merge "Pass pctx and ctx to NewRuleBuilder"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index 9000f7478..95a4e8804 100644 --- a/java/java.go +++ b/java/java.go @@ -3080,21 +3080,21 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { dexOutputFile := android.PathForModuleOut(ctx, ctx.ModuleName()+".jar") if j.dexpreopter.uncompressedDex { - rule := android.NewRuleBuilder() + rule := android.NewRuleBuilder(pctx, ctx) temporary := android.PathForModuleOut(ctx, ctx.ModuleName()+".jar.unaligned") rule.Temporary(temporary) // use zip2zip to uncompress classes*.dex files rule.Command(). - BuiltTool(ctx, "zip2zip"). + BuiltTool("zip2zip"). FlagWithInput("-i ", inputJar). FlagWithOutput("-o ", temporary). FlagWithArg("-0 ", "'classes*.dex'") // use zipalign to align uncompressed classes*.dex files rule.Command(). - BuiltTool(ctx, "zipalign"). + BuiltTool("zipalign"). Flag("-f"). Text("4"). Input(temporary). @@ -3102,7 +3102,7 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { rule.DeleteTemporaryFiles() - rule.Build(pctx, ctx, "uncompress_dex", "uncompress dex") + rule.Build("uncompress_dex", "uncompress dex") } else { ctx.Build(pctx, android.BuildParams{ Rule: android.Cp, |