summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-05-27 07:18:19 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-05-27 07:18:19 +0000
commitc7c7e466acc55779c0caa05dab90bbf38f00fa5f (patch)
tree99ce47a2356e9690d1705de88253fd57b4af8251 /java/java.go
parent97d095516eb94c1d3720f60f8dea4acbf1f2e072 (diff)
parent1fbf44089e468983fe88bdd9a26b4e8c269a1696 (diff)
Merge "AIDEGen: Add path attribute to okhttp module."
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go7
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