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

Check ABI regardless of arch variants

Browse Source 
The ABI reference dump directory names contained TARGET_ARCH_VARIANT
or TARGET_2ND_ARCH_VARIANT. The builds with non-generic arch variant
could not find the reference dumps for their arches. This commit renames
the directories to <TARGET_ARCH> and <TARGET_2ND_ARCH>_<TARGET_ARCH> to
ensure that all arch variants are checked.

Bug: 213127415
Test: lunch aosp_cf_x86_64_phone-userdebug && make

Change-Id: I7617f3ffc0e1bc423eea8c39e0f2b745276b4244
This commit is contained in:
Hsin-Yi Chen
2022-03-09 15:18:19 +08:00
parent 979b652dec
commit ee68c43d4b
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)
} }