From b36d31d8705ab648bd84cd5ca0e2136c040a5b22 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 27 Aug 2024 16:04:28 -0700 Subject: Add ctx argument to IDEInfo() 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 --- java/java.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 46344c842..55c878eb3 100644 --- a/java/java.go +++ b/java/java.go @@ -2404,15 +2404,15 @@ func (al *ApiLibrary) TargetSdkVersion(ctx android.EarlyModuleContext) android.A return al.SdkVersion(ctx).ApiLevel } -func (al *ApiLibrary) IDEInfo(i *android.IdeInfo) { - i.Deps = append(i.Deps, al.ideDeps()...) +func (al *ApiLibrary) IDEInfo(ctx android.BaseModuleContext, i *android.IdeInfo) { + i.Deps = append(i.Deps, al.ideDeps(ctx)...) i.Libs = append(i.Libs, al.properties.Libs...) i.Static_libs = append(i.Static_libs, al.properties.Static_libs...) i.SrcJars = append(i.SrcJars, al.stubsSrcJar.String()) } // deps of java_api_library for module_bp_java_deps.json -func (al *ApiLibrary) ideDeps() []string { +func (al *ApiLibrary) ideDeps(ctx android.BaseModuleContext) []string { ret := []string{} ret = append(ret, al.properties.Libs...) ret = append(ret, al.properties.Static_libs...) @@ -2933,7 +2933,7 @@ var _ android.IDECustomizedModuleName = (*Import)(nil) // Collect information for opening IDE project files in java/jdeps.go. -func (j *Import) IDEInfo(dpInfo *android.IdeInfo) { +func (j *Import) IDEInfo(ctx android.BaseModuleContext, dpInfo *android.IdeInfo) { dpInfo.Jars = append(dpInfo.Jars, j.combinedHeaderFile.String()) } -- cgit v1.2.3-59-g8ed1b