Run ABI checks for shared libs exported by APEX
This commit enables ABI checks for shared libs exported by APEX and
explicitly enabled ABI checks.
Bug: 145608479
Test: m com.android.resolv
Change-Id: I3b58178b0258df35fcc848e84642152516f6774f
diff --git a/cc/cc.go b/cc/cc.go
index f306a00..12ce454 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -284,6 +284,7 @@
isPgoCompile() bool
isNDKStubLibrary() bool
useClangLld(actx ModuleContext) bool
+ isForPlatform() bool
apexName() string
hasStubsVariants() bool
isStubs() bool
@@ -1047,10 +1048,6 @@
// Host modules do not need ABI dumps.
return false
}
- if !ctx.mod.IsForPlatform() {
- // APEX variants do not need ABI dumps.
- return false
- }
if ctx.isStubs() {
// Stubs do not need ABI dumps.
return false
@@ -1077,6 +1074,10 @@
return ctx.mod.getVndkExtendsModuleName()
}
+func (ctx *moduleContextImpl) isForPlatform() bool {
+ return ctx.mod.IsForPlatform()
+}
+
func (ctx *moduleContextImpl) apexName() string {
return ctx.mod.ApexName()
}
diff --git a/cc/library.go b/cc/library.go
index 98cae3d..6377542 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -509,6 +509,19 @@
if !ctx.shouldCreateSourceAbiDump() {
return false
}
+ if !ctx.isForPlatform() {
+ if !ctx.hasStubsVariants() {
+ // Skip ABI checks if this library is for APEX but isn't exported.
+ return false
+ }
+ if !Bool(library.Properties.Header_abi_checker.Enabled) {
+ // Skip ABI checks if this library is for APEX and did not explicitly enable
+ // ABI checks.
+ // TODO(b/145608479): ABI checks should be enabled by default. Remove this
+ // after evaluating the extra build time.
+ return false
+ }
+ }
return library.classifySourceAbiDump(ctx) != ""
}