StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AIDEGen: Add path attribute to okhttp module." am: c7c7e466ac

Browse Source 
Change-Id: I1792658947da52e6181b39cc952f1ff11be1163b
This commit is contained in:
Treehugger Robot
2020-05-27 07:30:01 +00:00
committed by Automerger Merge Worker
parent a858736c86 c7c7e466ac
commit d3205312ed
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/module.go
View File

@@ -2366,6 +2366,7 @@ type IdeInfo struct {
Classes []string `json:"class,omitempty"` Classes []string `json:"class,omitempty"`
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"`
} }
func CheckBlueprintSyntax(ctx BaseModuleContext, filename string, contents string) []error { func CheckBlueprintSyntax(ctx BaseModuleContext, filename string, contents string) []error {

7
genrule/genrule.go
View File

@@ -144,6 +144,9 @@ type Module struct {
subName string subName string
subDir string subDir string
// Collect the module directory for IDE info in java/jdeps.go.
modulePaths []string
} }
type taskFunc func(ctx android.ModuleContext, rawCommand string, srcFiles android.Paths) []generateTask type taskFunc func(ctx android.ModuleContext, rawCommand string, srcFiles android.Paths) []generateTask
@@ -190,6 +193,9 @@ func toolDepsMutator(ctx android.BottomUpMutatorContext) {
func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
g.subName = ctx.ModuleSubDir() g.subName = ctx.ModuleSubDir()
// Collect the module directory for IDE info in java/jdeps.go.
g.modulePaths = append(g.modulePaths, ctx.ModuleDir())
if len(g.properties.Export_include_dirs) > 0 { if len(g.properties.Export_include_dirs) > 0 {
for _, dir := range g.properties.Export_include_dirs { for _, dir := range g.properties.Export_include_dirs {
g.exportedIncludeDirs = append(g.exportedIncludeDirs, g.exportedIncludeDirs = append(g.exportedIncludeDirs,
@@ -529,6 +535,7 @@ func (g *Module) IDEInfo(dpInfo *android.IdeInfo) {
dpInfo.Deps = append(dpInfo.Deps, src) dpInfo.Deps = append(dpInfo.Deps, src)
} }
} }
dpInfo.Paths = append(dpInfo.Paths, g.modulePaths...)
} }
func (g *Module) AndroidMk() android.AndroidMkData { func (g *Module) AndroidMk() android.AndroidMkData {

7
java/java.go
View File

@@ -471,6 +471,9 @@ type Module struct {
kytheFiles android.Paths kytheFiles android.Paths
distFile android.Path distFile android.Path
// Collect the module directory for IDE info in java/jdeps.go.
modulePaths []string
} }
func (j *Module) OutputFiles(tag string) (android.Paths, error) { func (j *Module) OutputFiles(tag string) (android.Paths, error) {
@@ -1776,6 +1779,7 @@ func (j *Module) IDEInfo(dpInfo *android.IdeInfo) {
if j.expandJarjarRules != nil { if j.expandJarjarRules != nil {
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...)
} }
func (j *Module) CompilerDeps() []string { func (j *Module) CompilerDeps() []string {
@@ -1856,6 +1860,9 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.deviceProperties.UncompressDex = j.dexpreopter.uncompressedDex j.deviceProperties.UncompressDex = j.dexpreopter.uncompressedDex
j.compile(ctx, nil) j.compile(ctx, nil)
// Collect the module directory for IDE info in java/jdeps.go.
j.modulePaths = append(j.modulePaths, ctx.ModuleDir())
exclusivelyForApex := android.InAnyApex(ctx.ModuleName()) && !j.IsForPlatform() exclusivelyForApex := android.InAnyApex(ctx.ModuleName()) && !j.IsForPlatform()
if (Bool(j.properties.Installable) || ctx.Host()) && !exclusivelyForApex { if (Bool(j.properties.Installable) || ctx.Host()) && !exclusivelyForApex {
var extraInstallDeps android.Paths var extraInstallDeps android.Paths

1
java/jdeps.go
View File

@@ -72,6 +72,7 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont
dpInfo.Jarjar_rules = android.FirstUniqueStrings(dpInfo.Jarjar_rules) dpInfo.Jarjar_rules = android.FirstUniqueStrings(dpInfo.Jarjar_rules)
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)
moduleInfos[name] = dpInfo moduleInfos[name] = dpInfo
mkProvider, ok := module.(android.AndroidMkDataProvider) mkProvider, ok := module.(android.AndroidMkDataProvider)