Merge "Separate LLNDK from the platform library dumps" into main

2024-02-02 04:34:50 +00:00
parent d8cb9505f8 50884dce3c
commit c9d4eab9fe
2 changed files with 19 additions and 19 deletions
--- a/cc/library.go
+++ b/cc/library.go
@@ -1480,7 +1480,9 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec
 			headerAbiChecker.Exclude_symbol_tags,
 			currVersion)

-		addLsdumpPath(classifySourceAbiDump(ctx) + ":" + library.sAbiOutputFile.String())
+		for _, tag := range classifySourceAbiDump(ctx) {
+			addLsdumpPath(tag + ":" + library.sAbiOutputFile.String())
+		}

 		dumpDir := getRefAbiDumpDir(isNdk, isLlndk)
 		binderBitness := ctx.DeviceConfig().BinderBitness()