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

Commit 51d0f34e authored Apr 18, 2022 by Yike Zhang Committed by Automerger Merge Worker Apr 18, 2022

Merge "Export Java library dependency information" am: 29f5068a

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

Change-Id: I93ab90767d1274966f9837a87e93fabf1c8eba95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 071ee7f9 29f5068a

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)