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

Revert "Use cp instead of install for ndk_headers"

Browse Source 
This reverts commit 1202729cb2.

Reason for revert: Breaks aosp-main/ndk builds

Change-Id: I453792f7f974dc336d5f6775adfc5899b8d34d7b
This commit is contained in:
Spandan Das
2024-04-04 17:11:43 +00:00
committed by Gerrit Code Review
parent 1202729cb2
commit c299c3f913
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/paths.go
View File

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