Pass pctx and ctx to NewRuleBuilder
Enable the RuleBuilder and RuleBuilderCommand methods to access the BuilderContext by passing it to NewRuleBuilder instead of RuleBuilder.Build. Test: genrule_test.go Test: rule_builder_test.go Test: m checkbuild Change-Id: I63e6597e19167393876dc2259d6f521363b7dabc
This commit is contained in:
@@ -3049,21 +3049,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).
|
||||
@@ -3071,7 +3071,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,
|
||||
|
Reference in New Issue
Block a user