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

Change deps of ctx.Install* from Paths to InstallPaths

Browse Source 
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
Ignore-AOSP-First: resolving conflict
Change-Id: I1ebef60a943bdbe907744cc43aa985371ac56d32
This commit is contained in:
Colin Cross
2023-11-15 12:29:33 -08:00
parent dcbf8fe78f
commit 5fcd83edaa
9 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/app.go
View File

@@ -858,7 +858,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
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)

4
java/java.go
View File

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

3
java/ravenwood.go
View File

@@ -16,6 +16,7 @@ package java
import (
"android/soong/android"
"android/soong/tradefed"
"github.com/google/blueprint/proptools"
)
@@ -100,7 +101,7 @@ func (r *ravenwoodTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
r.Library.GenerateAndroidBuildActions(ctx)
// Start by depending on all files installed by dependancies
var installDeps android.Paths
var installDeps android.InstallPaths
for _, dep := range ctx.GetDirectDepsWithTag(ravenwoodTag) {
for _, installFile := range dep.FilesToInstall() {
installDeps = append(installDeps, installFile)

2
java/robolectric.go
View File

@@ -226,7 +226,7 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext)
}
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)

4
java/tradefed.go
View File

@@ -30,8 +30,8 @@ func tradefedJavaLibraryFactory() android.Module {
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}
}