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

Choose SAbi files with module's vndk version

Browse Source 
No matter what BOARD_VNDK_VERSION is set to, VNDKs should be regarded as
PLATFORM_VNDK_VERSION. This fixes an abidiff error due to the version
mismatch.

Bug: 157106227
Test: manual test with BOARD_VNDK_VERSION
Change-Id: I0d262b8ee5ac6f40fea7c2fb18322531434c0b4b
This commit is contained in:
Inseob Kim
2020-06-09 22:05:09 +09:00
parent 4e372f7841
commit 96f17f0eed
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cc/library.go
View File

@@ -1077,9 +1077,14 @@ func getRefAbiDumpFile(ctx ModuleContext, vndkVersion, fileName string) android.
func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objects, fileName string, soFile android.Path) { func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objects, fileName string, soFile android.Path) {
if library.shouldCreateSourceAbiDump(ctx) { if library.shouldCreateSourceAbiDump(ctx) {
vndkVersion := ctx.DeviceConfig().PlatformVndkVersion() var vndkVersion string
if ver := ctx.DeviceConfig().VndkVersion(); ver != "" && ver != "current" {
vndkVersion = ver if ctx.useVndk() {
// For modules linking against vndk, follow its vndk version
vndkVersion = ctx.Module().(*Module).VndkVersion()
} else {
// Regard the other modules as PLATFORM_VNDK_VERSION
vndkVersion = ctx.DeviceConfig().PlatformVndkVersion()
} }
exportIncludeDirs := library.flagExporter.exportedIncludes(ctx) exportIncludeDirs := library.flagExporter.exportedIncludes(ctx)