Merge "Generate ABI dumps for libraries without source"
This commit is contained in:
4
cc/cc.go
4
cc/cc.go
@@ -778,6 +778,10 @@ func (ctx *moduleContextImpl) shouldCreateVndkSourceAbiDump(config android.Confi
|
|||||||
// APEX variants do not need ABI dumps.
|
// APEX variants do not need ABI dumps.
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
if ctx.isStubs() {
|
||||||
|
// Stubs do not need ABI dumps.
|
||||||
|
return false
|
||||||
|
}
|
||||||
if ctx.isNdk() {
|
if ctx.isNdk() {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
@@ -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) {
|
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()
|
vndkVersion := ctx.DeviceConfig().PlatformVndkVersion()
|
||||||
if ver := ctx.DeviceConfig().VndkVersion(); ver != "" && ver != "current" {
|
if ver := ctx.DeviceConfig().VndkVersion(); ver != "" && ver != "current" {
|
||||||
vndkVersion = ver
|
vndkVersion = ver
|
||||||
|
Reference in New Issue
Block a user