tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Export Java library dependency information"

Browse source
This commit is contained in:
Yike Zhang 2022-04-18 04:58:47 +00:00 committed by Gerrit Code Review
commit 29f5068a1c
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/module.go
View file

@ -3734,6 +3734,8 @@ type IdeInfo struct {
Installed_paths []string `json:"installed,omitempty"` Installed_paths []string `json:"installed,omitempty"`
SrcJars []string `json:"srcjars,omitempty"` SrcJars []string `json:"srcjars,omitempty"`
Paths []string `json:"path,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 { func CheckBlueprintSyntax(ctx BaseModuleContext, filename string, contents string) []error {

2
java/base.go
View file

@ -1694,6 +1694,8 @@ func (j *Module) IDEInfo(dpInfo *android.IdeInfo) {
dpInfo.Jarjar_rules = append(dpInfo.Jarjar_rules, j.expandJarjarRules.String()) dpInfo.Jarjar_rules = append(dpInfo.Jarjar_rules, j.expandJarjarRules.String())
} }
dpInfo.Paths = append(dpInfo.Paths, j.modulePaths...) 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 { func (j *Module) CompilerDeps() []string {

2
java/jdeps.go
View file

@ -71,6 +71,8 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont
dpInfo.Jars = android.FirstUniqueStrings(dpInfo.Jars) dpInfo.Jars = android.FirstUniqueStrings(dpInfo.Jars)
dpInfo.SrcJars = android.FirstUniqueStrings(dpInfo.SrcJars) dpInfo.SrcJars = android.FirstUniqueStrings(dpInfo.SrcJars)
dpInfo.Paths = android.FirstUniqueStrings(dpInfo.Paths) dpInfo.Paths = android.FirstUniqueStrings(dpInfo.Paths)
dpInfo.Static_libs = android.FirstUniqueStrings(dpInfo.Static_libs)
dpInfo.Libs = android.FirstUniqueStrings(dpInfo.Libs)
moduleInfos[name] = dpInfo moduleInfos[name] = dpInfo
mkProvider, ok := module.(android.AndroidMkDataProvider) mkProvider, ok := module.(android.AndroidMkDataProvider)