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

Change-Id: I229231b44e448f72d896545ef525a6c2f39a5e1f
This commit is contained in:
Treehugger Robot
2020-05-27 07:42:54 +00:00
committed by Automerger Merge Worker
4 changed files with 16 additions and 0 deletions

View File

@@ -480,6 +480,9 @@ type Module struct {
kytheFiles android.Paths
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) {
@@ -1785,6 +1788,7 @@ func (j *Module) IDEInfo(dpInfo *android.IdeInfo) {
if j.expandJarjarRules != nil {
dpInfo.Jarjar_rules = append(dpInfo.Jarjar_rules, j.expandJarjarRules.String())
}
dpInfo.Paths = append(dpInfo.Paths, j.modulePaths...)
}
func (j *Module) CompilerDeps() []string {
@@ -1868,6 +1872,9 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.dexpreopter.uncompressedDex = *j.deviceProperties.Uncompress_dex
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()
if (Bool(j.properties.Installable) || ctx.Host()) && !exclusivelyForApex {
var extraInstallDeps android.Paths