diff options
| -rw-r--r-- | java/gen.go | 5 | ||||
| -rw-r--r-- | java/proto.go | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/java/gen.go b/java/gen.go index 5766a9471..4f928d507 100644 --- a/java/gen.go +++ b/java/gen.go @@ -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()). diff --git a/java/proto.go b/java/proto.go index cc9abbeee..dc5519f41 100644 --- a/java/proto.go +++ b/java/proto.go @@ -49,7 +49,7 @@ func genProto(ctx android.ModuleContext, protoFiles android.Paths, flags android // into a srcjar. rule.Command(). BuiltTool("soong_zip"). - Flag("-jar"). + Flag("-srcjar"). Flag("-write_if_changed"). FlagWithOutput("-o ", srcJarFile). FlagWithArg("-C ", outDir.String()). |