diff options
| author | Colin Cross <ccross@android.com> | 2023-11-20 19:38:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-20 19:38:57 +0000 |
| commit | 29deca77ce388855eeab35e0dc72b8fd2b2d219d (patch) | |
| tree | f161f406cf4b81f604d1998a370143ae02d2c55d /java/java.go | |
| parent | b91108c9c07c45ff708030114372db6d217b4e2d (diff) | |
| parent | d442a0e882aa49edbb944e21eaca2fca20d61b98 (diff) | |
Merge changes I65b06238,I1ebef60a into main
* changes:
Add DataPath.ToRelativeInstallPath
Change deps of ctx.Install* from Paths to InstallPaths
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
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) } |