openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Use soong_zip -srcjar for proto and aidl srcjars"

This commit is contained in:
Treehugger Robot 2020-12-24 03:04:37 +00:00 committed by Gerrit Code Review
parent 7dbc5786e3 cf02ec8747
commit b2d77d4a52
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/gen.go
View File

@ -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()).

2
java/proto.go
View File

@ -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()).