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

Merge "Check ABI regardless of arch variants"

Browse Source
This commit is contained in:
Hsin-Yi Chen
2022-03-16 02:09:40 +00:00
committed by Gerrit Code Review
parent 0ddc5724b0 ee68c43d4b
commit 66a357df9e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
android/paths.go
View File

@@ -1474,14 +1474,11 @@ func pathForModuleOut(ctx ModuleOutPathContext) OutputPath {
func PathForVndkRefAbiDump(ctx ModuleInstallPathContext, version, fileName string, func PathForVndkRefAbiDump(ctx ModuleInstallPathContext, version, fileName string,
isNdk, isLlndkOrVndk, isGzip bool) OptionalPath { isNdk, isLlndkOrVndk, isGzip bool) OptionalPath {
arches := ctx.DeviceConfig().Arches() currentArchType := ctx.Arch().ArchType
if len(arches) == 0 { primaryArchType := ctx.Config().DevicePrimaryArchType()
panic("device build with no primary arch") archName := currentArchType.String()
} if currentArchType != primaryArchType {
currentArch := ctx.Arch() archName += "_" + primaryArchType.String()
archNameAndVariant := currentArch.ArchType.String()
if currentArch.ArchVariant != "" {
archNameAndVariant += "_" + currentArch.ArchVariant
} }
var dirName string var dirName string
@@ -1503,7 +1500,7 @@ func PathForVndkRefAbiDump(ctx ModuleInstallPathContext, version, fileName strin
} }
return ExistentPathForSource(ctx, "prebuilts", "abi-dumps", dirName, return ExistentPathForSource(ctx, "prebuilts", "abi-dumps", dirName,
version, binderBitness, archNameAndVariant, "source-based", version, binderBitness, archName, "source-based",
fileName+ext) fileName+ext)
} }