Skip ABI checks for APEX variants of opt-in libraries
Test: make findlsdumps Bug: 138219814 Change-Id: I2ae6fadad5af4f7b648aa15307a0bd11339ffc7c
This commit is contained in:
17
cc/cc.go
17
cc/cc.go
@@ -267,7 +267,7 @@ type ModuleContextIntf interface {
|
||||
isVndkSp() bool
|
||||
isVndkExt() bool
|
||||
inRecovery() bool
|
||||
shouldCreateVndkSourceAbiDump(config android.Config) bool
|
||||
shouldCreateSourceAbiDump() bool
|
||||
selectedStl() string
|
||||
baseModuleName() string
|
||||
getVndkExtendsModuleName() string
|
||||
@@ -789,7 +789,7 @@ func (ctx *moduleContextImpl) inRecovery() bool {
|
||||
}
|
||||
|
||||
// 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") {
|
||||
return false
|
||||
}
|
||||
@@ -815,18 +815,7 @@ func (ctx *moduleContextImpl) shouldCreateVndkSourceAbiDump(config android.Confi
|
||||
// Stubs do not need ABI dumps.
|
||||
return false
|
||||
}
|
||||
if ctx.isNdk() {
|
||||
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
|
||||
return true
|
||||
}
|
||||
|
||||
func (ctx *moduleContextImpl) selectedStl() string {
|
||||
|
Reference in New Issue
Block a user