Merge changes Ifc905b14,I62166c6d into main am: edcbad4054 am: 8ab67df967

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3212518

Change-Id: Ib12c24c1b07801d3761094c7b7d2699e58c040fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-08-08 02:17:15 +00:00
committed by Automerger Merge Worker
2 changed files with 5 additions and 1 deletions

View File

@@ -1448,3 +1448,7 @@ func AARImportFactory() android.Module {
InitJavaModuleMultiTargets(module, android.DeviceSupported)
return module
}
func (a *AARImport) IDEInfo(dpInfo *android.IdeInfo) {
dpInfo.Jars = append(dpInfo.Jars, a.headerJarFile.String(), a.rJar.String())
}

View File

@@ -2910,7 +2910,7 @@ var _ android.IDECustomizedModuleName = (*Import)(nil)
// Collect information for opening IDE project files in java/jdeps.go.
func (j *Import) IDEInfo(dpInfo *android.IdeInfo) {
dpInfo.Jars = append(dpInfo.Jars, j.PrebuiltSrcs()...)
dpInfo.Jars = append(dpInfo.Jars, j.combinedHeaderFile.String())
}
func (j *Import) IDECustomizedModuleName() string {