openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Automatically enable abi checker for the stub libs" 

am: c61c83db9a

Change-Id: I44b7eebdd0b2ac55b55c4b0f2fa1448bdf80ba9d
This commit is contained in:
Jiyong Park 2019-08-29 23:10:19 -07:00 committed by android-build-merger
parent 2867f766d4 c61c83db9a
commit 777050e48e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cc/library.go
View File

@ -464,7 +464,7 @@ func (library *libraryDecorator) classifySourceAbiDump(ctx ModuleContext) string
}
}
}
if enabled != nil && Bool(enabled) {
if Bool(enabled) || ctx.hasStubsVariants() {
return "PLATFORM"
}
return ""
@ -894,7 +894,7 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec
}
exportedHeaderFlags := strings.Join(SourceAbiFlags, " ")
library.sAbiOutputFile = TransformDumpToLinkedDump(ctx, objs.sAbiDumpFiles, soFile, fileName, exportedHeaderFlags,
android.OptionalPathForModuleSrc(ctx, library.Properties.Header_abi_checker.Symbol_file),
android.OptionalPathForModuleSrc(ctx, library.symbolFileForAbiCheck(ctx)),
library.Properties.Header_abi_checker.Exclude_symbol_versions,
library.Properties.Header_abi_checker.Exclude_symbol_tags)
@ -1095,6 +1095,16 @@ func (library *libraryDecorator) buildStubs() bool {
return library.MutatedProperties.BuildStubs
}
func (library *libraryDecorator) symbolFileForAbiCheck(ctx ModuleContext) *string {
if library.Properties.Header_abi_checker.Symbol_file != nil {
return library.Properties.Header_abi_checker.Symbol_file
}
if ctx.hasStubsVariants() && library.Properties.Stubs.Symbol_file != nil {
return library.Properties.Stubs.Symbol_file
}
return nil
}
func (library *libraryDecorator) stubsVersion() string {
return library.MutatedProperties.StubsVersion
}