StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't require merge_annotations_dir for annotations_enabled" into rvc-dev am: 601fdd97b6

Browse Source 
Change-Id: I78569c89258c20334111d7942fe5d4aca800e506
This commit is contained in:
Anton Hansson
2020-05-25 09:14:54 +00:00
committed by Automerger Merge Worker
parent 3824aa0d27 601fdd97b6
commit 8584de91c8
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/droiddoc.go
View File

@@ -1309,13 +1309,10 @@ func (d *Droidstubs) annotationsFlags(ctx android.ModuleContext, cmd *android.Ru
d.annotationsZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"_annotations.zip")
cmd.FlagWithOutput("--extract-annotations ", d.annotationsZip)
if len(d.properties.Merge_annotations_dirs) == 0 {
ctx.PropertyErrorf("merge_annotations_dirs",
"has to be non-empty if annotations was enabled!")
if len(d.properties.Merge_annotations_dirs) != 0 {
d.mergeAnnoDirFlags(ctx, cmd)
}
d.mergeAnnoDirFlags(ctx, cmd)
// TODO(tnorbye): find owners to fix these warnings when annotation was enabled.
cmd.FlagWithArg("--hide ", "HiddenTypedefConstant").
FlagWithArg("--hide ", "SuperfluousPrefix").