diff --git a/android/module.go b/android/module.go index 66a5f60ad..ab68e24f1 100644 --- a/android/module.go +++ b/android/module.go @@ -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 { diff --git a/java/base.go b/java/base.go index 5802099ae..c6c560935 100644 --- a/java/base.go +++ b/java/base.go @@ -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 { diff --git a/java/jdeps.go b/java/jdeps.go index eff9a3174..373433517 100644 --- a/java/jdeps.go +++ b/java/jdeps.go @@ -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)