Change deps of ctx.Install* from Paths to InstallPaths
Installed files should only depend on other installed files, change the deps arguments of the ctx.Install* methods from Paths to InstallPaths. Bug: 311428265 Test: builds Change-Id: I1ebef60a943bdbe907744cc43aa985371ac56d32 Merged-In: I1ebef60a943bdbe907744cc43aa985371ac56d32
This commit is contained in:
@@ -641,7 +641,7 @@ type Library struct {
|
||||
|
||||
exportedProguardFlagFiles android.Paths
|
||||
|
||||
InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.Paths)
|
||||
InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.InstallPaths)
|
||||
}
|
||||
|
||||
var _ android.ApexModule = (*Library)(nil)
|
||||
@@ -722,7 +722,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
|
||||
exclusivelyForApex := !apexInfo.IsForPlatform()
|
||||
if (Bool(j.properties.Installable) || ctx.Host()) && !exclusivelyForApex {
|
||||
var extraInstallDeps android.Paths
|
||||
var extraInstallDeps android.InstallPaths
|
||||
if j.InstallMixin != nil {
|
||||
extraInstallDeps = j.InstallMixin(ctx, j.outputFile)
|
||||
}
|
||||
|
Reference in New Issue
Block a user