Remove isSourceDump from PathForVndkRefAbiDump()
This commit removes `isSourceDump` from `PathForVndkRefAbiDump()`
because the binary dump paths are not being used at all.
Test: lunch aosp_arm64_ab-userdebug && make
Change-Id: I7a6bb9053a6b052590fb1152982949fee897df8d
diff --git a/android/paths.go b/android/paths.go
index af2f956..f478bdd 100644
--- a/android/paths.go
+++ b/android/paths.go
@@ -828,23 +828,14 @@
// PathForVndkRefDump returns an OptionalPath representing the path of the reference
// 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 bool) OptionalPath {
arches := ctx.DeviceConfig().Arches()
currentArch := ctx.Arch()
archNameAndVariant := currentArch.ArchType.String()
if currentArch.ArchVariant != "" {
archNameAndVariant += "_" + currentArch.ArchVariant
}
- var sourceOrBinaryDir string
var vndkOrNdkDir string
- var ext string
- if isSourceDump {
- ext = ".lsdump.gz"
- sourceOrBinaryDir = "source-based"
- } else {
- ext = ".bdump.gz"
- sourceOrBinaryDir = "binary-based"
- }
if vndkOrNdk {
vndkOrNdkDir = "vndk"
} else {
@@ -854,8 +845,9 @@
panic("device build with no primary arch")
}
binderBitness := ctx.DeviceConfig().BinderBitness()
+ ext := ".lsdump.gz"
refDumpFileStr := "prebuilts/abi-dumps/" + vndkOrNdkDir + "/" + version + "/" + binderBitness + "/" +
- archNameAndVariant + "/" + sourceOrBinaryDir + "/" + fileName + ext
+ archNameAndVariant + "/source-based/" + fileName + ext
return ExistentPathForSource(ctx, refDumpFileStr)
}