diff options
| author | 2024-11-14 01:58:26 +0000 | |
|---|---|---|
| committer | 2024-11-14 01:58:26 +0000 | |
| commit | d74bf29dbac2f187a7dff38ccecd5ebf09a4e2ab (patch) | |
| tree | 27331d3c45b938a0909b2d45b1c6d25a4cc1a4f1 /filesystem/raw_binary.go | |
| parent | 7cd1d422c72f8ae0f0b9d8b312e113c3110c29a7 (diff) | |
| parent | 4e9f5923c0e7cf0d7f845b90c7da65c24e44bcee (diff) | |
Merge "Use fewer OutputPaths" into main
Diffstat (limited to 'filesystem/raw_binary.go')
| -rw-r--r-- | filesystem/raw_binary.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/filesystem/raw_binary.go b/filesystem/raw_binary.go index ad36c2935..707fba06f 100644 --- a/filesystem/raw_binary.go +++ b/filesystem/raw_binary.go @@ -42,7 +42,7 @@ type rawBinary struct { properties rawBinaryProperties - output android.OutputPath + output android.Path installDir android.InstallPath } @@ -71,7 +71,7 @@ func (r *rawBinary) installFileName() string { func (r *rawBinary) GenerateAndroidBuildActions(ctx android.ModuleContext) { inputFile := android.PathForModuleSrc(ctx, proptools.String(r.properties.Src)) - outputFile := android.PathForModuleOut(ctx, r.installFileName()).OutputPath + outputFile := android.PathForModuleOut(ctx, r.installFileName()) ctx.Build(pctx, android.BuildParams{ Rule: toRawBinary, @@ -83,11 +83,11 @@ func (r *rawBinary) GenerateAndroidBuildActions(ctx android.ModuleContext) { }, }) - r.output = outputFile r.installDir = android.PathForModuleInstall(ctx, "etc") - ctx.InstallFile(r.installDir, r.installFileName(), r.output) + ctx.InstallFile(r.installDir, r.installFileName(), outputFile) - ctx.SetOutputFiles([]android.Path{r.output}, "") + ctx.SetOutputFiles([]android.Path{outputFile}, "") + r.output = outputFile } var _ android.AndroidMkEntriesProvider = (*rawBinary)(nil) |