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

Merge "Fix typo" am: 7ec899ac67 am: bad86dde5d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434854

Change-Id: I5a55303b61a9f9282532a7213aab17c05cced508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-15 01:28:34 +00:00
committed by Automerger Merge Worker
parent 75e9588d8d bad86dde5d
commit 09fa997c8b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/paths.go
View File

@@ -1709,10 +1709,10 @@ func makePathForInstall(ctx ModuleInstallPathContext, os OsType, arch ArchType,
func pathForInstall(ctx PathContext, os OsType, arch ArchType, partition string, debug bool,
pathComponents ...string) InstallPath {
var partionPaths []string
var partitionPaths []string
if os.Class == Device {
partionPaths = []string{"target", "product", ctx.Config().DeviceName(), partition}
partitionPaths = []string{"target", "product", ctx.Config().DeviceName(), partition}
} else {
osName := os.String()
if os == Linux {
@@ -1734,21 +1734,21 @@ func pathForInstall(ctx PathContext, os OsType, arch ArchType, partition string,
if os.Class == Host && (arch == X86_64 || arch == Common) {
archName = "x86"
}
partionPaths = []string{"host", osName + "-" + archName, partition}
partitionPaths = []string{"host", osName + "-" + archName, partition}
}
if debug {
partionPaths = append([]string{"debug"}, partionPaths...)
partitionPaths = append([]string{"debug"}, partitionPaths...)
}
partionPath, err := validatePath(partionPaths...)
partitionPath, err := validatePath(partitionPaths...)
if err != nil {
reportPathError(ctx, err)
}
base := InstallPath{
basePath: basePath{partionPath, ""},
basePath: basePath{partitionPath, ""},
soongOutDir: ctx.Config().soongOutDir,
partitionDir: partionPath,
partitionDir: partitionPath,
partition: partition,
}