diff options
| author | 2025-03-14 17:12:06 -0700 | |
|---|---|---|
| committer | 2025-03-14 17:12:06 -0700 | |
| commit | 364ae51793c626498093a4c9544072927069ca04 (patch) | |
| tree | b76cf720d19bc4f864c101d4ababd44abbd7fc1e /java/java.go | |
| parent | 823bdf59d515868d6bcb907846a17d929cd7086e (diff) | |
| parent | 7909c860f9d79586d4e731b6162bf115ae10c778 (diff) | |
Merge "Change CommonModuleInfoProvider to a pointer." into main am: f2aacebb28 am: 7909c860f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3542441
Change-Id: I447ba2da2c55857d035bd2f10e10c7cdef5f1c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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. |