From 704c12d0bb1a819764c5101878e481a9c7b13554 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Mon, 29 Jan 2024 16:15:29 +0800 Subject: [PATCH] Find LLNDK dumps in prebuilts/abi-dumps/vndk LLNDK will not be finalized at the same time as APEX and NDK. The dumps have to be placed in a different directory. The new LLNDK dumps will be created in "vndk" directory. Test: lunch aosp_x86_64-next-eng ; make Bug: 314010764 Change-Id: I0726e3eabcfdbfb94a10f01ddd6dfb971552bd50 --- cc/library.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cc/library.go b/cc/library.go index ff30d40b9..4b6ac5966 100644 --- a/cc/library.go +++ b/cc/library.go @@ -1350,10 +1350,12 @@ func getRefAbiDumpFile(ctx android.ModuleInstallPathContext, fileName+".lsdump") } -func getRefAbiDumpDir(isNdk bool) string { +func getRefAbiDumpDir(isNdk, isLlndk bool) string { var dirName string if isNdk { dirName = "ndk" + } else if isLlndk { + dirName = "vndk" } else { dirName = "platform" } @@ -1476,7 +1478,7 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec addLsdumpPath(classifySourceAbiDump(ctx) + ":" + library.sAbiOutputFile.String()) - dumpDir := getRefAbiDumpDir(isNdk) + dumpDir := getRefAbiDumpDir(isNdk, isLlndk) binderBitness := ctx.DeviceConfig().BinderBitness() // Check against the previous version. prevVersionInt := prevRefAbiDumpVersion(ctx, dumpDir)