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

Merge "Fix typo" am: 7ec899ac67

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

Change-Id: I7574aa6c884f523a9a2e773b0e1f21cbfcfedf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-15 00:40:52 +00:00
committed by Automerger Merge Worker
parent 1a6ec80b34 7ec899ac67
commit bad86dde5d
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, func pathForInstall(ctx PathContext, os OsType, arch ArchType, partition string, debug bool,
pathComponents ...string) InstallPath { pathComponents ...string) InstallPath {
var partionPaths []string var partitionPaths []string
if os.Class == Device { if os.Class == Device {
partionPaths = []string{"target", "product", ctx.Config().DeviceName(), partition} partitionPaths = []string{"target", "product", ctx.Config().DeviceName(), partition}
} else { } else {
osName := os.String() osName := os.String()
if os == Linux { 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) { if os.Class == Host && (arch == X86_64 || arch == Common) {
archName = "x86" archName = "x86"
} }
partionPaths = []string{"host", osName + "-" + archName, partition} partitionPaths = []string{"host", osName + "-" + archName, partition}
} }
if debug { if debug {
partionPaths = append([]string{"debug"}, partionPaths...) partitionPaths = append([]string{"debug"}, partitionPaths...)
} }
partionPath, err := validatePath(partionPaths...) partitionPath, err := validatePath(partitionPaths...)
if err != nil { if err != nil {
reportPathError(ctx, err) reportPathError(ctx, err)
} }
base := InstallPath{ base := InstallPath{
basePath: basePath{partionPath, ""}, basePath: basePath{partitionPath, ""},
soongOutDir: ctx.Config().soongOutDir, soongOutDir: ctx.Config().soongOutDir,
partitionDir: partionPath, partitionDir: partitionPath,
partition: partition, partition: partition,
} }