diff options
| author | 2024-09-06 18:36:35 +0000 | |
|---|---|---|
| committer | 2024-09-06 18:36:35 +0000 | |
| commit | 219009f60695ba87d382f03f1de59b9f1b6170b2 (patch) | |
| tree | 0909f6e8c066d51f59d176e6e8734f0d1ca493f8 /java/aar.go | |
| parent | f2c204c655254a16761018c782603183c2b7d211 (diff) | |
| parent | b749347fa5cc9cd4018a8ebae0b6df37c2afa70e (diff) | |
Merge "Make the java static_libs property configurable" into main
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/aar.go b/java/aar.go index 62edd05a4..b5e24c4b2 100644 --- a/java/aar.go +++ b/java/aar.go @@ -973,7 +973,7 @@ type AARImportProperties struct { // Defaults to sdk_version if not set. See sdk_version for possible values. Min_sdk_version *string // List of java static libraries that the included ARR (android library prebuilts) has dependencies to. - Static_libs []string + Static_libs proptools.Configurable[[]string] // List of java libraries that the included ARR (android library prebuilts) has dependencies to. Libs []string // If set to true, run Jetifier against .aar file. Defaults to false. @@ -1103,7 +1103,7 @@ func (a *AARImport) DepsMutator(ctx android.BottomUpMutatorContext) { } ctx.AddVariationDependencies(nil, libTag, a.properties.Libs...) - ctx.AddVariationDependencies(nil, staticLibTag, a.properties.Static_libs...) + ctx.AddVariationDependencies(nil, staticLibTag, a.properties.Static_libs.GetOrDefault(ctx, nil)...) a.usesLibrary.deps(ctx, false) } |