summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2025-03-15 14:01:24 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2025-03-15 14:01:24 -0700
commitdc320bd27bd8ce9770417b3129e8b5a678302486 (patch)
treed7dc8d3e765db83cafa33d725c8c8b3af2f35cb0 /java/java.go
parent3c77f8b28da07ff0e35a64167ffa3713b31b3e08 (diff)
parentaf77fd1025a62585b4689cd2062f18a1f3984ff4 (diff)
Snap for 13221802 from af77fd1025a62585b4689cd2062f18a1f3984ff4 to 25Q2-release
Change-Id: I67d740eb6e355c0a913cc97fec739226f025c17a
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go
index 7f897a04f..dd9f852f0 100644
--- a/java/java.go
+++ b/java/java.go
@@ -2235,7 +2235,7 @@ func (j *Binary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// install these alongside the java binary.
ctx.VisitDirectDepsProxyWithTag(jniInstallTag, func(jni android.ModuleProxy) {
// Use the BaseModuleName of the dependency (without any prebuilt_ prefix)
- commonInfo, _ := android.OtherModuleProvider(ctx, jni, android.CommonModuleInfoProvider)
+ commonInfo := android.OtherModulePointerProviderOrDefault(ctx, jni, android.CommonModuleInfoProvider)
j.androidMkNamesOfJniLibs = append(j.androidMkNamesOfJniLibs, commonInfo.BaseModuleName+":"+commonInfo.Target.Arch.ArchType.Bitness())
})
// Check that native libraries are not listed in `required`. Prompt users to use `jni_libs` instead.