AIDEGen: Add path attribute to okhttp module.
Bug: 157115477
Test: 1. aidegen Settings -n
open merged_module_info.json
"okhttp": {
...
"path": ["external/okhttp"]
},
modules: "mimemap-testing-res.jar", "mimemap-res.jar"
"services.core.priorityboosted", "framework-tethering"
"bouncycastle_ike_digests",
"robolectric-sqlite4java-native"
have the 'path' attribute.
Change-Id: If3628887866c29dcc948dd427727f175a5199edc
diff --git a/java/java.go b/java/java.go
index 5b1dcd7..3747eb7 100644
--- a/java/java.go
+++ b/java/java.go
@@ -461,6 +461,9 @@
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) {
@@ -1765,6 +1768,7 @@
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 {
@@ -1845,6 +1849,9 @@
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