Merge "Choose SAbi files with module's vndk version" (9a0b8979) · Commits · e / os / android_build_soong

cc/library.go

+8 −3

Original line number	Diff line number	Diff line
		@@ -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) {
		if library.shouldCreateSourceAbiDump(ctx) {
		vndkVersion := ctx.DeviceConfig().PlatformVndkVersion()
		if ver := ctx.DeviceConfig().VndkVersion(); ver != "" && ver != "current" {
		vndkVersion = ver
		var vndkVersion string

		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)