Merge "Find LLNDK dumps in prebuilts/abi-dumps/vndk" into main
This commit is contained in:
commit
7acf94b221
1 changed files with 4 additions and 2 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue