diff options
| author | 2020-12-23 17:13:16 -0800 | |
|---|---|---|
| committer | 2020-12-23 17:13:16 -0800 | |
| commit | cf02ec87476e7dc044e85cc04b4182df3f53cbd2 (patch) | |
| tree | 3bb924016947b1c5c8629cbb2c2dc17b0ab2d1d5 | |
| parent | 1f8c2729846b83e24c09292ef5739b13375f7c0c (diff) | |
Use soong_zip -srcjar for proto and aidl srcjars
IntelliJ's indexer is unhappy with the full paths in the proto
and aidl srcjars. Use the -srcjar argument to soong_zip, which
causes it to extract the correct filename for .java files based on
the package statement in the file.
Bug: 176209347
Test: manual
Change-Id: I63d9d4f6ba670e3b851835d719519d675ae54c7f
| -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()). |