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

Fix ndk x86_64 and mips64 builds am: c7fd91a266

Browse Source 
am: 24280d5a63

* commit '24280d5a6318eb4fc6449b5e73c1f32e226f4bee':
  Fix ndk x86_64 and mips64 builds

Change-Id: If75d30592e0013b9ae40fc36164c6e1a40ea2f3d
This commit is contained in:
Colin Cross
2016-05-18 22:53:31 +00:00
committed by android-build-merger
parent 0a87789639 24280d5a63
commit 424b5d26aa
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).
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",
version, toolchain.Name()))
suffix := ""
// 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,