Merge changes I420a5953,I8e2352f3,I7a6bb905

* changes:
  Support text ABI dump file format
  Remove vndkVsNdk()
  Remove isSourceDump from PathForVndkRefAbiDump()

1 files changed, 24 insertions, 21 deletions

diff --git a/android/paths.go b/android/paths.go
index af2f9567..31c5977e 100644
--- a/android/paths.go
+++ b/android/paths.go
@@ -826,37 +826,40 @@ func pathForModule(ctx ModuleContext) OutputPath {
 	return PathForOutput(ctx, ".intermediates", ctx.ModuleDir(), ctx.ModuleName(), ctx.ModuleSubDir())
 }
 
-// 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 {
+// PathForVndkRefAbiDump 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,
+	isLlndk, 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
 	}
-	var sourceOrBinaryDir string
-	var vndkOrNdkDir string
-	var ext string
-	if isSourceDump {
-		ext = ".lsdump.gz"
-		sourceOrBinaryDir = "source-based"
+
+	var dirName string
+	if isLlndk {
+		dirName = "ndk"
 	} else {
-		ext = ".bdump.gz"
-		sourceOrBinaryDir = "binary-based"
+		dirName = "vndk"
 	}
-	if vndkOrNdk {
-		vndkOrNdkDir = "vndk"
+
+	binderBitness := ctx.DeviceConfig().BinderBitness()
+
+	var ext string
+	if isGzip {
+		ext = ".lsdump.gz"
 	} else {
-		vndkOrNdkDir = "ndk"
-	}
-	if len(arches) == 0 {
-		panic("device build with no primary arch")
+		ext = ".lsdump"
 	}
-	binderBitness := ctx.DeviceConfig().BinderBitness()
-	refDumpFileStr := "prebuilts/abi-dumps/" + vndkOrNdkDir + "/" + version + "/" + binderBitness + "/" +
-		archNameAndVariant + "/" + sourceOrBinaryDir + "/" + fileName + ext
-	return ExistentPathForSource(ctx, refDumpFileStr)
+
+	return ExistentPathForSource(ctx, "prebuilts", "abi-dumps", dirName,
+		version, binderBitness, archNameAndVariant, "source-based",
+		fileName+ext)
 }
 
 // PathForModuleOut returns a Path representing the paths... under the module's