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

Merge "Remove makePathForInstall" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-10-16 23:16:05 +00:00
committed by Gerrit Code Review
parent c82e844121 7b4de4b859
commit 60f72ffaa7
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/paths.go
View File

@@ -1684,19 +1684,19 @@ func (p InstallPath) ToMakePath() InstallPath {
func PathForModuleInstall(ctx ModuleInstallPathContext, pathComponents ...string) InstallPath { func PathForModuleInstall(ctx ModuleInstallPathContext, pathComponents ...string) InstallPath {
os, arch := osAndArch(ctx) os, arch := osAndArch(ctx)
partition := modulePartition(ctx, os) partition := modulePartition(ctx, os)
return makePathForInstall(ctx, os, arch, partition, ctx.Debug(), pathComponents...) return pathForInstall(ctx, os, arch, partition, ctx.Debug(), pathComponents...)
} }
// PathForHostDexInstall returns an InstallPath representing the install path for the // PathForHostDexInstall returns an InstallPath representing the install path for the
// module appended with paths... // module appended with paths...
func PathForHostDexInstall(ctx ModuleInstallPathContext, pathComponents ...string) InstallPath { func PathForHostDexInstall(ctx ModuleInstallPathContext, pathComponents ...string) InstallPath {
return makePathForInstall(ctx, ctx.Config().BuildOS, ctx.Config().BuildArch, "", ctx.Debug(), pathComponents...) return pathForInstall(ctx, ctx.Config().BuildOS, ctx.Config().BuildArch, "", ctx.Debug(), pathComponents...)
} }
// PathForModuleInPartitionInstall is similar to PathForModuleInstall but partition is provided by the caller // PathForModuleInPartitionInstall is similar to PathForModuleInstall but partition is provided by the caller
func PathForModuleInPartitionInstall(ctx ModuleInstallPathContext, partition string, pathComponents ...string) InstallPath { func PathForModuleInPartitionInstall(ctx ModuleInstallPathContext, partition string, pathComponents ...string) InstallPath {
os, arch := osAndArch(ctx) os, arch := osAndArch(ctx)
return makePathForInstall(ctx, os, arch, partition, ctx.Debug(), pathComponents...) return pathForInstall(ctx, os, arch, partition, ctx.Debug(), pathComponents...)
} }
func osAndArch(ctx ModuleInstallPathContext) (OsType, ArchType) { func osAndArch(ctx ModuleInstallPathContext) (OsType, ArchType) {
@@ -1712,11 +1712,6 @@ func osAndArch(ctx ModuleInstallPathContext) (OsType, ArchType) {
return os, arch return os, arch
} }
func makePathForInstall(ctx ModuleInstallPathContext, os OsType, arch ArchType, partition string, debug bool, pathComponents ...string) InstallPath {
ret := pathForInstall(ctx, os, arch, partition, debug, pathComponents...)
return ret
}
func pathForInstall(ctx PathContext, os OsType, arch ArchType, partition string, debug bool, func pathForInstall(ctx PathContext, os OsType, arch ArchType, partition string, debug bool,
pathComponents ...string) InstallPath { pathComponents ...string) InstallPath {