diff options
| author | 2024-10-01 16:44:41 +0000 | |
|---|---|---|
| committer | 2024-10-01 16:44:41 +0000 | |
| commit | 371a037efb673f40b7385c3ccbe2b09b6523a06f (patch) | |
| tree | 2e864bf4e7f5b61fb2279cee35339cd46e9b92ea /java/robolectric.go | |
| parent | 05ff7f07209883f3bf34e9a3552db97f4847d792 (diff) | |
Make the java jni_libs property configurable
Bug: 323382414
Bug: 370563864
Test: m nothing --no-skip-soong-tests
Change-Id: Iae8f472c81fbbb192effb4b3cf0066b6160e6b6c
Diffstat (limited to 'java/robolectric.go')
| -rw-r--r-- | java/robolectric.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/robolectric.go b/java/robolectric.go index 374fc5f78..30c720352 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -76,7 +76,7 @@ type robolectricProperties struct { // Use strict mode to limit access of Robolectric API directly. See go/roboStrictMode Strict_mode *bool - Jni_libs []string + Jni_libs proptools.Configurable[[]string] } type robolectricTest struct { @@ -131,7 +131,7 @@ func (r *robolectricTest) DepsMutator(ctx android.BottomUpMutatorContext) { ctx.AddFarVariationDependencies(ctx.Config().BuildOSCommonTarget.Variations(), roboRuntimesTag, "robolectric-android-all-prebuilts") - for _, lib := range r.robolectricProperties.Jni_libs { + for _, lib := range r.robolectricProperties.Jni_libs.GetOrDefault(ctx, nil) { ctx.AddVariationDependencies(ctx.Config().BuildOSTarget.Variations(), jniLibTag, lib) } } |