StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ctx argument to IDEInfo()

Browse Source 
The IDEInfo() methods read properties. To make those properties
configurable, we need a context to evaluate them with.

Bug: 362579941
Test: m nothing --no-skip-soong-tests
Change-Id: I26d4b7084439b3006e50b02277298f74a929e1aa
This commit is contained in:
Cole Faust
2024-08-27 16:04:28 -07:00
parent 5b35cb9aef
commit b36d31d870
13 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/aar.go
View File

@@ -914,12 +914,12 @@ func (a *AndroidLibrary) setOutputFiles(ctx android.ModuleContext) {
setOutputFiles(ctx, a.Library.Module)
}
func (a *AndroidLibrary) IDEInfo(dpInfo *android.IdeInfo) {
a.Library.IDEInfo(dpInfo)
a.aapt.IDEInfo(dpInfo)
func (a *AndroidLibrary) IDEInfo(ctx android.BaseModuleContext, dpInfo *android.IdeInfo) {
a.Library.IDEInfo(ctx, dpInfo)
a.aapt.IDEInfo(ctx, dpInfo)
}
func (a *aapt) IDEInfo(dpInfo *android.IdeInfo) {
func (a *aapt) IDEInfo(ctx android.BaseModuleContext, dpInfo *android.IdeInfo) {
if a.rJar != nil {
dpInfo.Jars = append(dpInfo.Jars, a.rJar.String())
}
@@ -1451,6 +1451,6 @@ func AARImportFactory() android.Module {
return module
}
func (a *AARImport) IDEInfo(dpInfo *android.IdeInfo) {
func (a *AARImport) IDEInfo(ctx android.BaseModuleContext, dpInfo *android.IdeInfo) {
dpInfo.Jars = append(dpInfo.Jars, a.headerJarFile.String(), a.rJar.String())
}