Make the java static_libs property configurable
Bug: 362579941 Test: m nothing --no-skip-soong-tests Change-Id: Iccc93cf14753aae1adb26c6eedd00aabf1c2f6a6
This commit is contained in:
10
java/rro.go
10
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 {
|
||||
|
Reference in New Issue
Block a user