Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66a357df authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by Gerrit Code Review
Browse files

Merge "Check ABI regardless of arch variants"

parents 0ddc5724 ee68c43d

android/paths.go

+6 −9
Original line number Diff line number Diff line
@@ -1474,14 +1474,11 @@ func pathForModuleOut(ctx ModuleOutPathContext) OutputPath { 
func PathForVndkRefAbiDump(ctx ModuleInstallPathContext, version, fileName string,

	isNdk, isLlndkOrVndk, isGzip bool) OptionalPath {



	arches := ctx.DeviceConfig().Arches()

	if len(arches) == 0 {

		panic("device build with no primary arch")

	}

	currentArch := ctx.Arch()

	archNameAndVariant := currentArch.ArchType.String()

	if currentArch.ArchVariant != "" {

		archNameAndVariant += "_" + currentArch.ArchVariant

	currentArchType := ctx.Arch().ArchType

	primaryArchType := ctx.Config().DevicePrimaryArchType()

	archName := currentArchType.String()

	if currentArchType != primaryArchType {

		archName += "_" + primaryArchType.String()

	}



	var dirName string
@@ -1503,7 +1500,7 @@ func PathForVndkRefAbiDump(ctx ModuleInstallPathContext, version, fileName strin 
	}



	return ExistentPathForSource(ctx, "prebuilts", "abi-dumps", dirName,

		version, binderBitness, archNameAndVariant, "source-based",

		version, binderBitness, archName, "source-based",

		fileName+ext)

}