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 "Skip ABI checks for APEX variants of opt-in libraries"

This commit is contained in:
Hsin-Yi Chen 2019-08-07 02:00:43 +00:00 committed by Gerrit Code Review
parent 7f0560d962 af17d74a1a
commit ff7321b32a
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cc/cc.go
View File

@ -267,7 +267,7 @@ type ModuleContextIntf interface {
isVndkSp() bool isVndkSp() bool
isVndkExt() bool isVndkExt() bool
inRecovery() bool inRecovery() bool
shouldCreateVndkSourceAbiDump(config android.Config) bool shouldCreateSourceAbiDump() bool
selectedStl() string selectedStl() string
baseModuleName() string baseModuleName() string
getVndkExtendsModuleName() string getVndkExtendsModuleName() string
@ -789,7 +789,7 @@ func (ctx *moduleContextImpl) inRecovery() bool {
} }
// Check whether ABI dumps should be created for this module. // Check whether ABI dumps should be created for this module.
func (ctx *moduleContextImpl) shouldCreateVndkSourceAbiDump(config android.Config) bool { func (ctx *moduleContextImpl) shouldCreateSourceAbiDump() bool {
if ctx.ctx.Config().IsEnvTrue("SKIP_ABI_CHECKS") { if ctx.ctx.Config().IsEnvTrue("SKIP_ABI_CHECKS") {
return false return false
} }
@ -815,18 +815,7 @@ func (ctx *moduleContextImpl) shouldCreateVndkSourceAbiDump(config android.Confi
// Stubs do not need ABI dumps. // Stubs do not need ABI dumps.
return false return false
} }
if ctx.isNdk() { return true
return true
}
if ctx.isLlndkPublic(config) {
return true
}
if ctx.useVndk() && ctx.isVndk() && !ctx.isVndkPrivate(config) {
// Return true if this is VNDK-core, VNDK-SP, or VNDK-Ext and this is not
// VNDK-private.
return true
}
return false
} }
func (ctx *moduleContextImpl) selectedStl() string { func (ctx *moduleContextImpl) selectedStl() string {

22
cc/library.go
View File

@ -432,11 +432,25 @@ func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags, d
return flags return flags
} }
func (library *libraryDecorator) shouldCreateVndkSourceAbiDump(ctx ModuleContext) bool { func (library *libraryDecorator) shouldCreateSourceAbiDump(ctx ModuleContext) bool {
if !ctx.shouldCreateSourceAbiDump() {
return false
}
if library.Properties.Header_abi_checker.Enabled != nil { if library.Properties.Header_abi_checker.Enabled != nil {
return Bool(library.Properties.Header_abi_checker.Enabled) return Bool(library.Properties.Header_abi_checker.Enabled)
} }
return ctx.shouldCreateVndkSourceAbiDump(ctx.Config()) if ctx.isNdk() {
return true
}
if ctx.isLlndkPublic(ctx.Config()) {
return true
}
if ctx.useVndk() && ctx.isVndk() && !ctx.isVndkPrivate(ctx.Config()) {
// Return true if this is VNDK-core, VNDK-SP, or VNDK-Ext, and not
// VNDK-private.
return true
}
return false
} }
func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) Objects { func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) Objects {
@ -458,7 +472,7 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa
} }
return Objects{} return Objects{}
} }
if library.shouldCreateVndkSourceAbiDump(ctx) || library.sabi.Properties.CreateSAbiDumps { if library.shouldCreateSourceAbiDump(ctx) || library.sabi.Properties.CreateSAbiDumps {
exportIncludeDirs := library.flagExporter.exportedIncludes(ctx) exportIncludeDirs := library.flagExporter.exportedIncludes(ctx)
var SourceAbiFlags []string var SourceAbiFlags []string
for _, dir := range exportIncludeDirs.Strings() { for _, dir := range exportIncludeDirs.Strings() {
@ -822,7 +836,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 library.shouldCreateVndkSourceAbiDump(ctx) { if library.shouldCreateSourceAbiDump(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