Fix the condition for LLNDK ABI diff
IsLlndk() returns whether the library is an LLNDK stub. The ABI check should identify LLNDK implementation by isImplementationForLLNDKPublic(). Test: development/vndk/tools/header-checker/utils/create_reference_dumps.py \ && make Bug: 227282691 Change-Id: I570871e24d9029992a722b3052f8bb6e7f3c0f52
This commit is contained in:
@@ -1910,26 +1910,28 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec
|
||||
|
||||
addLsdumpPath(classifySourceAbiDump(ctx) + ":" + library.sAbiOutputFile.String())
|
||||
|
||||
isNdk := ctx.isNdk(ctx.Config())
|
||||
isLlndk := ctx.isImplementationForLLNDKPublic()
|
||||
// If NDK or PLATFORM library, check against previous version ABI.
|
||||
if !ctx.useVndk() {
|
||||
prevRefAbiDumpFile := getRefAbiDumpFile(ctx, strconv.Itoa(prevVersion), fileName)
|
||||
if prevRefAbiDumpFile != nil {
|
||||
library.prevSAbiDiff = sourceAbiDiff(ctx, library.sAbiOutputFile.Path(),
|
||||
prevRefAbiDumpFile, fileName, exportedHeaderFlags,
|
||||
prevRefAbiDumpFile, fileName,
|
||||
library.Properties.Header_abi_checker.Diff_flags, prevVersion,
|
||||
Bool(library.Properties.Header_abi_checker.Check_all_apis),
|
||||
ctx.IsLlndk(), ctx.isNdk(ctx.Config()), ctx.IsVndkExt(), true)
|
||||
isLlndk || isNdk, ctx.IsVndkExt(), true)
|
||||
}
|
||||
}
|
||||
|
||||
refAbiDumpFile := getRefAbiDumpFile(ctx, version, fileName)
|
||||
if refAbiDumpFile != nil {
|
||||
library.sAbiDiff = sourceAbiDiff(ctx, library.sAbiOutputFile.Path(),
|
||||
refAbiDumpFile, fileName, exportedHeaderFlags,
|
||||
refAbiDumpFile, fileName,
|
||||
library.Properties.Header_abi_checker.Diff_flags,
|
||||
/* unused if not previousVersionDiff */ 0,
|
||||
Bool(library.Properties.Header_abi_checker.Check_all_apis),
|
||||
ctx.IsLlndk(), ctx.isNdk(ctx.Config()), ctx.IsVndkExt(), false)
|
||||
isLlndk || isNdk, ctx.IsVndkExt(), false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user