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

Merge "Generate ABI dumps for libraries without source"

Browse source 
am: 30057808e1

Change-Id: I8628ba2e93b32919bdda3d8478db1aadeabf441d
This commit is contained in:
Hsin-Yi Chen 2019-06-26 19:28:16 -07:00 committed by android-build-merger
commit 1ee24e40dd
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cc/cc.go
View file

@ -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
}

2
cc/library.go
View file

@ -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