commit 09ad3a6505b6345cc793acc68280069b37f816c0
author Colin Cross <ccross@android.com> Wed Nov 15 12:29:33 2023 -0800
committer Colin Cross <ccross@android.com> Fri Nov 17 19:06:43 2023 -0800
tree 6eb2d137e7f84ec2cf867ae5f32bed33b5e810a2
parent 4b9d9350bd336dca00b3e1497146ed1c0999a4f7

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

java/app.go

diff --git a/java/app.go b/java/app.go
index 9b7f4c4..6d7411d 100755
--- a/java/app.go
+++ b/java/app.go
@@ -869,7 +869,7 @@
 			ctx.InstallFile(allowlistInstallPath, allowlistInstallFilename, a.privAppAllowlist.Path())
 		}
 
-		var extraInstalledPaths android.Paths
+		var extraInstalledPaths android.InstallPaths
 		for _, extra := range a.extraOutputFiles {
 			installed := ctx.InstallFile(a.installDir, extra.Base(), extra)
 			extraInstalledPaths = append(extraInstalledPaths, installed)

java/java.go

diff --git a/java/java.go b/java/java.go
index 500ae37..bb9357c 100644
--- a/java/java.go
+++ b/java/java.go
@@ -641,7 +641,7 @@
 
 	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 @@
 
 	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)
 		}

java/robolectric.go

diff --git a/java/robolectric.go b/java/robolectric.go
index a8e6bfa..a66b310 100644
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -226,7 +226,7 @@
 	}
 
 	installPath := android.PathForModuleInstall(ctx, r.BaseModuleName())
-	var installDeps android.Paths
+	var installDeps android.InstallPaths
 
 	if r.manifest != nil {
 		r.data = append(r.data, r.manifest)

java/tradefed.go

diff --git a/java/tradefed.go b/java/tradefed.go
index ebbdec1..349b327 100644
--- a/java/tradefed.go
+++ b/java/tradefed.go
@@ -30,8 +30,8 @@
 	return module
 }
 
-func tradefedJavaLibraryInstall(ctx android.ModuleContext, path android.Path) android.Paths {
+func tradefedJavaLibraryInstall(ctx android.ModuleContext, path android.Path) android.InstallPaths {
 	installedPath := ctx.InstallFile(android.PathForModuleInstall(ctx, "tradefed"),
 		ctx.ModuleName()+".jar", path)
-	return android.Paths{installedPath}
+	return android.InstallPaths{installedPath}
 }