diff options
| author | 2024-10-01 16:44:41 +0000 | |
|---|---|---|
| committer | 2024-10-01 16:44:41 +0000 | |
| commit | 371a037efb673f40b7385c3ccbe2b09b6523a06f (patch) | |
| tree | 2e864bf4e7f5b61fb2279cee35339cd46e9b92ea /apex/apex.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 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/apex.go b/apex/apex.go index aff69c12f..35f78ccc4 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -209,7 +209,7 @@ type ApexNativeDependencies struct { Native_shared_libs proptools.Configurable[[]string] // List of JNI libraries that are embedded inside this APEX. - Jni_libs []string + Jni_libs proptools.Configurable[[]string] // List of rust dyn libraries that are embedded inside this APEX. Rust_dyn_libs []string @@ -295,7 +295,7 @@ type ResolvedApexNativeDependencies struct { // Merge combines another ApexNativeDependencies into this one func (a *ResolvedApexNativeDependencies) Merge(ctx android.BaseMutatorContext, b ApexNativeDependencies) { a.Native_shared_libs = append(a.Native_shared_libs, b.Native_shared_libs.GetOrDefault(ctx, nil)...) - a.Jni_libs = append(a.Jni_libs, b.Jni_libs...) + a.Jni_libs = append(a.Jni_libs, b.Jni_libs.GetOrDefault(ctx, nil)...) a.Rust_dyn_libs = append(a.Rust_dyn_libs, b.Rust_dyn_libs...) a.Binaries = append(a.Binaries, b.Binaries.GetOrDefault(ctx, nil)...) a.Tests = append(a.Tests, b.Tests...) @@ -846,7 +846,7 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { deps.Merge(ctx, ApexNativeDependencies{ Native_shared_libs: proptools.NewConfigurable[[]string](nil, nil), Tests: nil, - Jni_libs: nil, + Jni_libs: proptools.NewConfigurable[[]string](nil, nil), Binaries: a.properties.Binaries, }) } |