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

Merge "Find LLNDK dumps in prebuilts/abi-dumps/vndk" into main

Browse Source
This commit is contained in:
Hsin-Yi Chen
2024-01-30 09:05:16 +00:00
committed by Gerrit Code Review
parent 2d08b2abff 704c12d0bb
commit 7acf94b221
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/library.go
View File

@@ -1350,10 +1350,12 @@ func getRefAbiDumpFile(ctx android.ModuleInstallPathContext,
fileName+".lsdump") fileName+".lsdump")
} }
func getRefAbiDumpDir(isNdk bool) string { func getRefAbiDumpDir(isNdk, isLlndk bool) string {
var dirName string var dirName string
if isNdk { if isNdk {
dirName = "ndk" dirName = "ndk"
} else if isLlndk {
dirName = "vndk"
} else { } else {
dirName = "platform" dirName = "platform"
} }
@@ -1476,7 +1478,7 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec
addLsdumpPath(classifySourceAbiDump(ctx) + ":" + library.sAbiOutputFile.String()) addLsdumpPath(classifySourceAbiDump(ctx) + ":" + library.sAbiOutputFile.String())
dumpDir := getRefAbiDumpDir(isNdk) dumpDir := getRefAbiDumpDir(isNdk, isLlndk)
binderBitness := ctx.DeviceConfig().BinderBitness() binderBitness := ctx.DeviceConfig().BinderBitness()
// Check against the previous version. // Check against the previous version.
prevVersionInt := prevRefAbiDumpVersion(ctx, dumpDir) prevVersionInt := prevRefAbiDumpVersion(ctx, dumpDir)