StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AIDEGen: Add path attribute to okhttp module."

Browse Source
This commit is contained in:
Treehugger Robot
2020-05-27 07:18:19 +00:00
committed by Gerrit Code Review
parent 97d095516e 1fbf44089e
commit c7c7e466ac
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java.go
View File

@@ -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