tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix the logic for selecting ABI dump paths" am: 74b2c7cb38 am: c5eaf3f03f

Browse source 
Change-Id: I78863cef1e10b2d35c2c8d44e225f6db59e75ef2
This commit is contained in:
Hsin-Yi Chen 2020-03-31 03:13:20 +00:00 committed by Automerger Merge Worker
commit afa4e4ba89
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cc/library.go
View file

@ -1024,8 +1024,9 @@ func (library *libraryDecorator) coverageOutputFilePath() android.OptionalPath {
}
func getRefAbiDumpFile(ctx ModuleContext, vndkVersion, fileName string) android.Path {
// The logic must be consistent with classifySourceAbiDump.
isNdk := ctx.isNdk()
isLlndkOrVndk := ctx.isLlndkPublic(ctx.Config()) || ctx.isVndk()
isLlndkOrVndk := ctx.isLlndkPublic(ctx.Config()) || (ctx.useVndk() && ctx.isVndk())
refAbiDumpTextFile := android.PathForVndkRefAbiDump(ctx, vndkVersion, fileName, isNdk, isLlndkOrVndk, false)
refAbiDumpGzipFile := android.PathForVndkRefAbiDump(ctx, vndkVersion, fileName, isNdk, isLlndkOrVndk, true)