Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ee24e40 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by android-build-merger
Browse files

Merge "Generate ABI dumps for libraries without source" 

am: 30057808

Change-Id: I8628ba2e93b32919bdda3d8478db1aadeabf441d
parents 7b4a1905 30057808

cc/cc.go

+4 −0
Original line number Diff line number Diff line
@@ -778,6 +778,10 @@ func (ctx *moduleContextImpl) shouldCreateVndkSourceAbiDump(config android.Confi 
		// APEX variants do not need ABI dumps.

		return false

	}

	if ctx.isStubs() {

		// Stubs do not need ABI dumps.

		return false

	}

	if ctx.isNdk() {

		return true

	}

cc/library.go

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ func getRefAbiDumpFile(ctx ModuleContext, vndkVersion, fileName string) android. 
}



func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objects, fileName string, soFile android.Path) {

	if len(objs.sAbiDumpFiles) > 0 && library.shouldCreateVndkSourceAbiDump(ctx) {

	if library.shouldCreateVndkSourceAbiDump(ctx) {

		vndkVersion := ctx.DeviceConfig().PlatformVndkVersion()

		if ver := ctx.DeviceConfig().VndkVersion(); ver != "" && ver != "current" {

			vndkVersion = ver