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

Merge "Use cp instead of install for ndk_headers" into main am: e5e0fb0fe5 am: 0eba0b9839

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

Change-Id: I64b1c2fce2822ad2a97cacee719bb919c780c552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das
2024-04-04 17:53:46 +00:00
committed by Automerger Merge Worker
parent 59ac5bc391 0eba0b9839
commit c0b571c240
4 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/paths.go
View File

@@ -1831,17 +1831,13 @@ func pathForInstall(ctx PathContext, os OsType, arch ArchType, partition string,
return base.Join(ctx, pathComponents...)
}
func pathForNdkOrSdkInstall(ctx PathContext, prefix string, paths []string) InstallPath {
base := pathForPartitionInstallDir(ctx, "", prefix, false)
return base.Join(ctx, paths...)
}
func PathForNdkInstall(ctx PathContext, paths ...string) InstallPath {
return pathForNdkOrSdkInstall(ctx, "ndk", paths)
func PathForNdkInstall(ctx PathContext, paths ...string) OutputPath {
return PathForOutput(ctx, append([]string{"ndk"}, paths...)...)
}
func PathForMainlineSdksInstall(ctx PathContext, paths ...string) InstallPath {
return pathForNdkOrSdkInstall(ctx, "mainline-sdks", paths)
base := pathForPartitionInstallDir(ctx, "", "mainline-sdks", false)
return base.Join(ctx, paths...)
}
func InstallPathToOnDevicePath(ctx PathContext, path InstallPath) string {