diff options
| author | 2024-09-06 18:36:35 +0000 | |
|---|---|---|
| committer | 2024-09-06 18:36:35 +0000 | |
| commit | 219009f60695ba87d382f03f1de59b9f1b6170b2 (patch) | |
| tree | 0909f6e8c066d51f59d176e6e8734f0d1ca493f8 /java/rro.go | |
| parent | f2c204c655254a16761018c782603183c2b7d211 (diff) | |
| parent | b749347fa5cc9cd4018a8ebae0b6df37c2afa70e (diff) | |
Merge "Make the java static_libs property configurable" into main
Diffstat (limited to 'java/rro.go')
| -rw-r--r-- | java/rro.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/java/rro.go b/java/rro.go index 0fc6e1c6f..8bb9be2eb 100644 --- a/java/rro.go +++ b/java/rro.go @@ -17,7 +17,11 @@ package java // This file contains the module implementations for runtime_resource_overlay and // override_runtime_resource_overlay. -import "android/soong/android" +import ( + "android/soong/android" + + "github.com/google/blueprint/proptools" +) func init() { RegisterRuntimeResourceOverlayBuildComponents(android.InitRegistrationContext) @@ -71,7 +75,7 @@ type RuntimeResourceOverlayProperties struct { Min_sdk_version *string // list of android_library modules whose resources are extracted and linked against statically - Static_libs []string + Static_libs proptools.Configurable[[]string] // list of android_app modules whose resources are extracted and linked against Resource_libs []string @@ -120,7 +124,7 @@ func (r *RuntimeResourceOverlay) DepsMutator(ctx android.BottomUpMutatorContext) ctx.AddDependency(ctx.Module(), certificateTag, cert) } - ctx.AddVariationDependencies(nil, staticLibTag, r.properties.Static_libs...) + ctx.AddVariationDependencies(nil, staticLibTag, r.properties.Static_libs.GetOrDefault(ctx, nil)...) ctx.AddVariationDependencies(nil, libTag, r.properties.Resource_libs...) for _, aconfig_declaration := range r.aaptProperties.Flags_packages { |