diff options
| author | 2024-09-30 20:50:38 +0000 | |
|---|---|---|
| committer | 2024-09-30 21:06:08 +0000 | |
| commit | 6d39c70d0b7e51e2f7c9cd60e733a7d08b62e8b0 (patch) | |
| tree | 29774315690a3c9db95596ce6fa105abc27d6f5c /java/java.go | |
| parent | 82bea76a4f13c1f3d71bdf7741de4d9265352a6f (diff) | |
Make the java jni_libs property configurable
Bug: 323382414
Bug: 370563864
Test: m nothing --no-skip-soong-tests
Change-Id: I11d8350d338e44d27537c6e5529034ba8a38265c
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index ab11363c1..a2a430856 100644 --- a/java/java.go +++ b/java/java.go @@ -1301,7 +1301,7 @@ type testProperties struct { Test_options TestOptions // Names of modules containing JNI libraries that should be installed alongside the test. - Jni_libs []string + Jni_libs proptools.Configurable[[]string] // Install the test into a folder named for the module in all test suites. Per_testcase_directory *bool @@ -1485,10 +1485,11 @@ func (j *TestHost) DepsMutator(ctx android.BottomUpMutatorContext) { } } - if len(j.testProperties.Jni_libs) > 0 { + jniLibs := j.testProperties.Jni_libs.GetOrDefault(ctx, nil) + if len(jniLibs) > 0 { for _, target := range ctx.MultiTargets() { sharedLibVariations := append(target.Variations(), blueprint.Variation{Mutator: "link", Variation: "shared"}) - ctx.AddFarVariationDependencies(sharedLibVariations, jniLibTag, j.testProperties.Jni_libs...) + ctx.AddFarVariationDependencies(sharedLibVariations, jniLibTag, jniLibs...) } } |