diff options
| author | 2020-05-21 10:11:59 +0800 | |
|---|---|---|
| committer | 2020-05-21 11:25:51 +0800 | |
| commit | 1fbf44089e468983fe88bdd9a26b4e8c269a1696 (patch) | |
| tree | b5c393364de24b97177ce8b8caaa7f5aeea4ff0c /java | |
| parent | 166349beebb9f56621f90f5815fbfc57b5c48291 (diff) | |
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
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 7 | ||||
| -rw-r--r-- | java/jdeps.go | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 5b1dcd7cf..3747eb719 100644 --- a/java/java.go +++ b/java/java.go @@ -461,6 +461,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) { @@ -1765,6 +1768,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 { @@ -1845,6 +1849,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 diff --git a/java/jdeps.go b/java/jdeps.go index 49e3de3cc..9f4388733 100644 --- a/java/jdeps.go +++ b/java/jdeps.go @@ -72,6 +72,7 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont dpInfo.Jarjar_rules = android.FirstUniqueStrings(dpInfo.Jarjar_rules) dpInfo.Jars = android.FirstUniqueStrings(dpInfo.Jars) dpInfo.SrcJars = android.FirstUniqueStrings(dpInfo.SrcJars) + dpInfo.Paths = android.FirstUniqueStrings(dpInfo.Paths) moduleInfos[name] = dpInfo mkProvider, ok := module.(android.AndroidMkDataProvider) |