Merge "AIDEGen: Add path attribute to okhttp module." am: c7c7e466ac
am: d3205312ed
Change-Id: I229231b44e448f72d896545ef525a6c2f39a5e1f
This commit is contained in:
@@ -480,6 +480,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) {
|
||||
@@ -1785,6 +1788,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 {
|
||||
@@ -1868,6 +1872,9 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
j.dexpreopter.uncompressedDex = *j.deviceProperties.Uncompress_dex
|
||||
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
|
||||
|
Reference in New Issue
Block a user