diff options
Diffstat (limited to 'java/gen.go')
| -rw-r--r-- | java/gen.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/java/gen.go b/java/gen.go index d50a6653e..445a2d8a3 100644 --- a/java/gen.go +++ b/java/gen.go @@ -57,7 +57,7 @@ func genAidl(ctx android.ModuleContext, aidlFiles android.Paths, aidlFlags strin outDir := srcJarFile.ReplaceExtension(ctx, "tmp") - rule := android.NewRuleBuilder() + rule := android.NewRuleBuilder(pctx, ctx) rule.Command().Text("rm -rf").Flag(outDir.String()) rule.Command().Text("mkdir -p").Flag(outDir.String()) @@ -78,10 +78,7 @@ func genAidl(ctx android.ModuleContext, aidlFiles android.Paths, aidlFlags strin rule.Command(). Tool(ctx.Config().HostToolPath(ctx, "soong_zip")). - // TODO(b/124333557): this can't use -srcjar for now, aidl on parcelables generates java files - // without a package statement, which causes -srcjar to put them in the top level of the zip file. - // Once aidl skips parcelables we can use -srcjar. - //Flag("-srcjar"). + Flag("-srcjar"). Flag("-write_if_changed"). FlagWithOutput("-o ", srcJarFile). FlagWithArg("-C ", outDir.String()). @@ -98,7 +95,7 @@ func genAidl(ctx android.ModuleContext, aidlFiles android.Paths, aidlFlags strin ruleDesc += " " + strconv.Itoa(i) } - rule.Build(pctx, ctx, ruleName, ruleDesc) + rule.Build(ruleName, ruleDesc) } return srcJarFiles @@ -177,6 +174,12 @@ type logtagsProducer interface { logtags() android.Paths } +func (j *Module) logtags() android.Paths { + return j.logtagsSrcs +} + +var _ logtagsProducer = (*Module)(nil) + type logtagsSingleton struct{} func (l *logtagsSingleton) GenerateBuildActions(ctx android.SingletonContext) { |