StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move NDK ABI monitoring enabling flag to release flags" into main am: fb510be871

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2843703

Change-Id: I1d32fefcbc05e07d1898f2ffbb1888b2947a594b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aleksei Vetrov
2023-12-06 12:29:22 +00:00
committed by Automerger Merge Worker
parent d798f5c879 fb510be871
commit d193a77232
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/config.go
View File

@@ -239,6 +239,11 @@ func (c Config) ReleaseDefaultModuleBuildFromSource() bool {
Bool(c.config.productVariables.ReleaseDefaultModuleBuildFromSource) Bool(c.config.productVariables.ReleaseDefaultModuleBuildFromSource)
} }
// Enables ABI monitoring of NDK libraries
func (c Config) ReleaseNdkAbiMonitored() bool {
return c.config.productVariables.GetBuildFlagBool("RELEASE_NDK_ABI_MONITORED")
}
// A DeviceConfig object represents the configuration for a particular device // A DeviceConfig object represents the configuration for a particular device
// being built. For now there will only be one of these, but in the future there // being built. For now there will only be one of these, but in the future there
// may be multiple devices being built. // may be multiple devices being built.

14
cc/ndk_library.go
View File

@@ -334,18 +334,12 @@ func canDumpAbi(config android.Config) bool {
return false return false
} }
// http://b/156513478 // http://b/156513478
// http://b/277624006 return config.ReleaseNdkAbiMonitored()
// This step is expensive. We're not able to do anything with the outputs of
// this step yet (canDiffAbi is flagged off because libabigail isn't able to
// handle all our libraries), disable it. There's no sense in protecting
// against checking in code that breaks abidw since by the time any of this
// can be turned on we'll need to migrate to STG anyway.
return false
} }
// Feature flag to disable diffing against prebuilts. // Feature flag to disable diffing against prebuilts.
func canDiffAbi() bool { func canDiffAbi(config android.Config) bool {
return false return config.ReleaseNdkAbiMonitored()
} }
func (this *stubDecorator) dumpAbi(ctx ModuleContext, symbolList android.Path) { func (this *stubDecorator) dumpAbi(ctx ModuleContext, symbolList android.Path) {
@@ -476,7 +470,7 @@ func (c *stubDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) O
c.versionScriptPath = nativeAbiResult.versionScript c.versionScriptPath = nativeAbiResult.versionScript
if canDumpAbi(ctx.Config()) { if canDumpAbi(ctx.Config()) {
c.dumpAbi(ctx, nativeAbiResult.symbolList) c.dumpAbi(ctx, nativeAbiResult.symbolList)
if canDiffAbi() { if canDiffAbi(ctx.Config()) {
c.diffAbi(ctx) c.diffAbi(ctx)
} }
} }