summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2025-03-10 14:02:04 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-10 14:02:04 -0700
commit0a4888dfae4fb88e0f80dad86b80702ec1fa74da (patch)
tree39c1e14bbff8b6c1d28f7543880240809d61220c /java/java.go
parent8fe189d07b442003f0f83cd5aef1c612afd6d7a1 (diff)
parenta369dc00143821fa7784d1bfa9d2986186b23742 (diff)
Merge "Rename CommonModuleInfoKey to be consistent with others." into main am: a369dc0014
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3482009 Change-Id: If06d794c2a16c4184ca2f6eef75a7adb98e84c8d 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.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go
index 215fbbda8..235a27d4c 100644
--- a/java/java.go
+++ b/java/java.go
@@ -2225,7 +2225,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.CommonModuleInfoKey)
+ commonInfo, _ := android.OtherModuleProvider(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.