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

Fix ndk x86_64 and mips64 builds

Browse Source 
am: c7fd91a266

* commit 'c7fd91a2660c7e0af1ccea0d662e0804998769ee':
  Fix ndk x86_64 and mips64 builds

Change-Id: I03db57ffabde18f8345aa7d4d9cc1d351ae63faf
This commit is contained in:
Colin Cross
2016-05-18 22:48:08 +00:00
committed by android-build-merger
parent 3429da5c70 c7fd91a266
commit 24280d5a63
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/cc.go
View File

@@ -2321,8 +2321,14 @@ func (*toolchainLibraryLinker) installable() bool {
// than to the system image). // than to the system image).
func getNdkLibDir(ctx common.AndroidModuleContext, toolchain Toolchain, version string) common.SourcePath { func getNdkLibDir(ctx common.AndroidModuleContext, toolchain Toolchain, version string) common.SourcePath {
return common.PathForSource(ctx, fmt.Sprintf("prebuilts/ndk/current/platforms/android-%s/arch-%s/usr/lib", suffix := ""
version, toolchain.Name())) // Most 64-bit NDK prebuilts store libraries in "lib64", except for arm64 which is not a
// multilib toolchain and stores the libraries in "lib".
if toolchain.Is64Bit() && ctx.Arch().ArchType != common.Arm64 {
suffix = "64"
}
return common.PathForSource(ctx, fmt.Sprintf("prebuilts/ndk/current/platforms/android-%s/arch-%s/usr/lib%s",
version, toolchain.Name(), suffix))
} }
func ndkPrebuiltModuleToPath(ctx common.AndroidModuleContext, toolchain Toolchain, func ndkPrebuiltModuleToPath(ctx common.AndroidModuleContext, toolchain Toolchain,