diff options
author | 2025-03-14 15:56:03 -0700 | |
---|---|---|
committer | 2025-03-14 15:56:03 -0700 | |
commit | f2aacebb28cf16f9c3fa4c59a9a9a931ab6b0846 (patch) | |
tree | da660a6da02da57b771ebc1f7ea1bf3189a90c47 /java/java.go | |
parent | 5fe9b839b0b67218bcdfdbeec06b6813f040939e (diff) | |
parent | f22120fb1da7f75a571966124bb0da6a57fd4f07 (diff) |
Merge "Change CommonModuleInfoProvider to a pointer." into main
Diffstat (limited to 'java/java.go')
-rw-r--r-- | java/java.go | 2 |
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. |