Merge "Remove makePathForInstall" into main (60f72ffa) · Commits · e / os / android_build_soong

android/paths.go

+3 −8

Original line number	Diff line number	Diff line
		@@ -1684,19 +1684,19 @@ func (p InstallPath) ToMakePath() InstallPath {
		func PathForModuleInstall(ctx ModuleInstallPathContext, pathComponents ...string) InstallPath {
		os, arch := osAndArch(ctx)
		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
		// module appended with paths...
		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
		func PathForModuleInPartitionInstall(ctx ModuleInstallPathContext, partition string, pathComponents ...string) InstallPath {
		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) {
		@@ -1712,11 +1712,6 @@ func osAndArch(ctx ModuleInstallPathContext) (OsType, ArchType) {
		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,
		pathComponents ...string) InstallPath {