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

For abi diffing, factor in arch variant and primary arch.

Browse Source 
am: ac066c6b90

Change-Id: Ifb7df61cee156e4578bf8af90b7d9263335c4448
This commit is contained in:
Jayant Chowdhary
2018-03-02 01:50:05 +00:00
committed by android-build-merger
parent f49ff89266 ac066c6b90
commit 1bb2bac825
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
android/paths.go
View File

@@ -776,7 +776,12 @@ func pathForModule(ctx ModuleContext) OutputPath {
// PathForVndkRefDump returns an OptionalPath representing the path of the reference // PathForVndkRefDump returns an OptionalPath representing the path of the reference
// abi dump for the given module. This is not guaranteed to be valid. // abi dump for the given module. This is not guaranteed to be valid.
func PathForVndkRefAbiDump(ctx ModuleContext, version, fileName string, vndkOrNdk, isSourceDump bool) OptionalPath { func PathForVndkRefAbiDump(ctx ModuleContext, version, fileName string, vndkOrNdk, isSourceDump bool) OptionalPath {
archName := ctx.Arch().ArchType.Name arches := ctx.DeviceConfig().Arches()
currentArch := ctx.Arch()
archNameAndVariant := currentArch.ArchType.String()
if currentArch.ArchVariant != "" {
archNameAndVariant += "_" + currentArch.ArchVariant
}
var sourceOrBinaryDir string var sourceOrBinaryDir string
var vndkOrNdkDir string var vndkOrNdkDir string
var ext string var ext string
@@ -792,8 +797,12 @@ func PathForVndkRefAbiDump(ctx ModuleContext, version, fileName string, vndkOrNd
} else { } else {
vndkOrNdkDir = "ndk" vndkOrNdkDir = "ndk"
} }
refDumpFileStr := "prebuilts/abi-dumps/" + vndkOrNdkDir + "/" + version + "/" + if len(arches) == 0 {
archName + "/" + sourceOrBinaryDir + "/" + fileName + ext panic("device build with no primary arch")
}
primary_arch := arches[0].ArchType.String()
refDumpFileStr := "prebuilts/abi-dumps/" + vndkOrNdkDir + "/" + version + "/" + primary_arch + "/" +
archNameAndVariant + "/" + sourceOrBinaryDir + "/" + fileName + ext
return ExistentPathForSource(ctx, refDumpFileStr) return ExistentPathForSource(ctx, refDumpFileStr)
} }