diff options
| author | 2024-10-01 16:44:41 +0000 | |
|---|---|---|
| committer | 2024-10-01 16:44:41 +0000 | |
| commit | 371a037efb673f40b7385c3ccbe2b09b6523a06f (patch) | |
| tree | 2e864bf4e7f5b61fb2279cee35339cd46e9b92ea /java/app.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/app.go')
| -rw-r--r-- | java/app.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/app.go b/java/app.go index b77793bad..f07d9e518 100644 --- a/java/app.go +++ b/java/app.go @@ -83,7 +83,7 @@ type appProperties struct { Package_splits []string // list of native libraries that will be provided in or alongside the resulting jar - Jni_libs []string `android:"arch_variant"` + Jni_libs proptools.Configurable[[]string] `android:"arch_variant"` // if true, use JNI libraries that link against platform APIs even if this module sets // sdk_version. @@ -311,7 +311,7 @@ func (a *AndroidApp) DepsMutator(ctx android.BottomUpMutatorContext) { } else { tag = jniInstallTag } - ctx.AddFarVariationDependencies(variation, tag, a.appProperties.Jni_libs...) + ctx.AddFarVariationDependencies(variation, tag, a.appProperties.Jni_libs.GetOrDefault(ctx, nil)...) } for _, aconfig_declaration := range a.aaptProperties.Flags_packages { ctx.AddDependency(ctx.Module(), aconfigDeclarationTag, aconfig_declaration) @@ -428,7 +428,7 @@ func (a *AndroidApp) checkAppSdkVersions(ctx android.ModuleContext) { func (a *AndroidApp) checkEmbedJnis(ctx android.BaseModuleContext) { apexInfo, _ := android.ModuleProvider(ctx, android.ApexInfoProvider) apkInApex := !apexInfo.IsForPlatform() - hasJnis := len(a.appProperties.Jni_libs) > 0 + hasJnis := len(a.appProperties.Jni_libs.GetOrDefault(ctx, nil)) > 0 if apkInApex && hasJnis && !Bool(a.appProperties.Use_embedded_native_libs) { ctx.ModuleErrorf("APK in APEX should have use_embedded_native_libs: true") |