diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-27 07:30:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 07:30:01 +0000 |
| commit | d3205312ed0920998b93e4c401ae87963cb18e2a (patch) | |
| tree | 99ce47a2356e9690d1705de88253fd57b4af8251 /java/java.go | |
| parent | a858736c869fd92787d8340aa585430c96f2f2a8 (diff) | |
| parent | c7c7e466acc55779c0caa05dab90bbf38f00fa5f (diff) | |
Merge "AIDEGen: Add path attribute to okhttp module." am: c7c7e466ac
Change-Id: I1792658947da52e6181b39cc952f1ff11be1163b
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index b97defa88..dedbf4719 100644 --- a/java/java.go +++ b/java/java.go @@ -471,6 +471,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) { @@ -1776,6 +1779,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 { @@ -1856,6 +1860,9 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.deviceProperties.UncompressDex = j.dexpreopter.uncompressedDex 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 |