diff options
| author | 2024-09-06 18:36:35 +0000 | |
|---|---|---|
| committer | 2024-09-06 18:36:35 +0000 | |
| commit | 219009f60695ba87d382f03f1de59b9f1b6170b2 (patch) | |
| tree | 0909f6e8c066d51f59d176e6e8734f0d1ca493f8 /java/droiddoc.go | |
| parent | f2c204c655254a16761018c782603183c2b7d211 (diff) | |
| parent | b749347fa5cc9cd4018a8ebae0b6df37c2afa70e (diff) | |
Merge "Make the java static_libs property configurable" into main
Diffstat (limited to 'java/droiddoc.go')
| -rw-r--r-- | java/droiddoc.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index f81c5bac5..2929bb8d9 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -54,7 +54,7 @@ type JavadocProperties struct { Filter_packages []string // list of java libraries that will be in the classpath. - Libs []string `android:"arch_variant"` + Libs proptools.Configurable[[]string] `android:"arch_variant"` // If set to false, don't allow this module(-docs.zip) to be exported. Defaults to true. Installable *bool @@ -274,7 +274,7 @@ func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) { } } - ctx.AddVariationDependencies(nil, libTag, j.properties.Libs...) + ctx.AddVariationDependencies(nil, libTag, j.properties.Libs.GetOrDefault(ctx, nil)...) } func (j *Javadoc) collectAidlFlags(ctx android.ModuleContext, deps deps) droiddocBuilderFlags { |