Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f628202a authored by Yike's avatar Yike
Browse files

Export Java library dependency information 

Write `static_libs` and `libs` of Java library and Android app modules to module_bp_java_deps.json. This enables downstream tools to correctly set up the runtime environment. Note that while static libraries don't need to be on the Java classpath these modules could have non-static library dependencies that do need to be present.

Test: m out/soong/module_bp_java_deps.json
Bug: 227538646
Change-Id: I7c4aecb2fb03c890f0d2aaae80e619f6176809ef
parent fa8e9cc3

android/module.go

+2 −0
Original line number Diff line number Diff line
@@ -3734,6 +3734,8 @@ type IdeInfo struct { 
	Installed_paths   []string `json:"installed,omitempty"`

	SrcJars           []string `json:"srcjars,omitempty"`

	Paths             []string `json:"path,omitempty"`

	Static_libs       []string `json:"static_libs,omitempty"`

	Libs              []string `json:"libs,omitempty"`

}



func CheckBlueprintSyntax(ctx BaseModuleContext, filename string, contents string) []error {

java/base.go

+2 −0
Original line number Diff line number Diff line
@@ -1694,6 +1694,8 @@ func (j *Module) IDEInfo(dpInfo *android.IdeInfo) { 
		dpInfo.Jarjar_rules = append(dpInfo.Jarjar_rules, j.expandJarjarRules.String())

	}

	dpInfo.Paths = append(dpInfo.Paths, j.modulePaths...)

	dpInfo.Static_libs = append(dpInfo.Static_libs, j.properties.Static_libs...)

	dpInfo.Libs = append(dpInfo.Libs, j.properties.Libs...)

}



func (j *Module) CompilerDeps() []string {

java/jdeps.go

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont 
		dpInfo.Jars = android.FirstUniqueStrings(dpInfo.Jars)

		dpInfo.SrcJars = android.FirstUniqueStrings(dpInfo.SrcJars)

		dpInfo.Paths = android.FirstUniqueStrings(dpInfo.Paths)

		dpInfo.Static_libs = android.FirstUniqueStrings(dpInfo.Static_libs)

		dpInfo.Libs = android.FirstUniqueStrings(dpInfo.Libs)

		moduleInfos[name] = dpInfo



		mkProvider, ok := module.(android.AndroidMkDataProvider)