From 65bfc29bb1df1c942d9a7bbe9f7ef0b4f014951e Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Thu, 2 Jan 2025 22:55:56 +0000 Subject: Use implementation jar in IDEInfo headerJar and implementationJar have the same classes and methods, but using implemetnationJar ensures that the jar is present in the intermediates directory after an `m $module` run. Bug: 384956156 Test: m android-support-fragment-nodeps out/soong/module_bp_java_deps.json Test: cat out/soong/module_bp_java_deps.json | jq '"android-support-fragment-nodeps"' Test: verified that the jar reported by the above command exists Test: m nothing --no-skip-soong-tests Change-Id: Ibd70c455b6bf12958b8f55d6c46ff2553a2f9d84 --- java/aar.go | 2 +- java/java.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/aar.go b/java/aar.go index c09ed9ea2..3c6244141 100644 --- a/java/aar.go +++ b/java/aar.go @@ -1644,5 +1644,5 @@ func AARImportFactory() android.Module { } func (a *AARImport) IDEInfo(ctx android.BaseModuleContext, dpInfo *android.IdeInfo) { - dpInfo.Jars = append(dpInfo.Jars, a.headerJarFile.String(), a.rJar.String()) + dpInfo.Jars = append(dpInfo.Jars, a.implementationJarFile.String(), a.rJar.String()) } diff --git a/java/java.go b/java/java.go index 64bc9599c..a975ca61c 100644 --- a/java/java.go +++ b/java/java.go @@ -3020,7 +3020,7 @@ var _ android.IDECustomizedModuleName = (*Import)(nil) // Collect information for opening IDE project files in java/jdeps.go. func (j *Import) IDEInfo(ctx android.BaseModuleContext, dpInfo *android.IdeInfo) { - dpInfo.Jars = append(dpInfo.Jars, j.combinedHeaderFile.String()) + dpInfo.Jars = append(dpInfo.Jars, j.combinedImplementationFile.String()) } func (j *Import) IDECustomizedModuleName() string { -- cgit v1.2.3-59-g8ed1b