summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2023-11-15 12:29:33 -0800
committer Colin Cross <ccross@android.com> 2023-11-17 19:06:43 -0800
commit09ad3a6505b6345cc793acc68280069b37f816c0 (patch)
tree6eb2d137e7f84ec2cf867ae5f32bed33b5e810a2 /java/java.go
parent4b9d9350bd336dca00b3e1497146ed1c0999a4f7 (diff)
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
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go
index 500ae37c7..bb9357cc7 100644
--- a/java/java.go
+++ b/java/java.go
@@ -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)
}